From f6dfc719d88fc0fd41a114f4ec0d670e962da0b8 Mon Sep 17 00:00:00 2001 From: Kenny Woodson Date: Fri, 12 Dec 2014 14:55:09 -0500 Subject: In order to agree with previous renaming these naming changes were made. --- inventory/multi_ec2.yaml.example | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 inventory/multi_ec2.yaml.example (limited to 'inventory/multi_ec2.yaml.example') diff --git a/inventory/multi_ec2.yaml.example b/inventory/multi_ec2.yaml.example new file mode 100644 index 000000000..bba26f016 --- /dev/null +++ b/inventory/multi_ec2.yaml.example @@ -0,0 +1,15 @@ +# meta inventory configs +clouds: + - name: aws1 + provider: aws/ec2.py + env_vars: + AWS_ACCESS_KEY_ID: XXXXXXXXXXXXXXXXXXXX + AWS_SECRET_ACCESS_KEY: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + + - name: aws2 + provider: aws/ec2.py + env_vars: + AWS_ACCESS_KEY_ID: XXXXXXXXXXXXXXXXXXXX + AWS_SECRET_ACCESS_KEY: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + +cache_max_age: 60 -- cgit v1.2.3 From 6eead926a86f3de1ea0dd4113a715a1516458bcc Mon Sep 17 00:00:00 2001 From: Kenny Woodson Date: Fri, 12 Dec 2014 17:21:30 -0500 Subject: Updated merge function to merge recursively --- inventory/multi_ec2.yaml.example | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'inventory/multi_ec2.yaml.example') diff --git a/inventory/multi_ec2.yaml.example b/inventory/multi_ec2.yaml.example index bba26f016..0bd505816 100644 --- a/inventory/multi_ec2.yaml.example +++ b/inventory/multi_ec2.yaml.example @@ -1,5 +1,5 @@ -# meta inventory configs -clouds: +# multi ec2 inventory configs +accounts: - name: aws1 provider: aws/ec2.py env_vars: -- cgit v1.2.3