summaryrefslogtreecommitdiffstats
path: root/inventory/multi_ec2.yaml.example
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2015-11-02 15:39:56 -0400
committerDevan Goodwin <dgoodwin@redhat.com>2015-11-02 15:39:56 -0400
commitcc65f03c894af8c40cf9c25128c9834f6cbdd02b (patch)
treecb7d113579bb1db1f685408b198397a89052b892 /inventory/multi_ec2.yaml.example
parentef6b36d14a00757754aaf001a8acad8354cf62ff (diff)
parenta4d5e59c413746cb1715b15a9e158be3f3a94a54 (diff)
downloadopenshift-cc65f03c894af8c40cf9c25128c9834f6cbdd02b.tar.gz
openshift-cc65f03c894af8c40cf9c25128c9834f6cbdd02b.tar.bz2
openshift-cc65f03c894af8c40cf9c25128c9834f6cbdd02b.tar.xz
openshift-cc65f03c894af8c40cf9c25128c9834f6cbdd02b.zip
Merge remote-tracking branch 'upstream/master' into upgrade
Diffstat (limited to 'inventory/multi_ec2.yaml.example')
-rw-r--r--inventory/multi_ec2.yaml.example2
1 files changed, 1 insertions, 1 deletions
diff --git a/inventory/multi_ec2.yaml.example b/inventory/multi_ec2.yaml.example
index 99f157b11..bbd81ad20 100644
--- a/inventory/multi_ec2.yaml.example
+++ b/inventory/multi_ec2.yaml.example
@@ -18,7 +18,7 @@ accounts:
AWS_ACCESS_KEY_ID: XXXXXXXXXXXXXXXXXXXX
AWS_SECRET_ACCESS_KEY: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
all_group: ec2
- hostvars:
+ extra_vars:
cloud: aws
account: aws1