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/.gitignore | 2 +- inventory/meta.yaml.example | 15 --------------- inventory/multi_ec2.py | 2 +- inventory/multi_ec2.yaml.example | 15 +++++++++++++++ 4 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 inventory/meta.yaml.example create mode 100644 inventory/multi_ec2.yaml.example (limited to 'inventory') diff --git a/inventory/.gitignore b/inventory/.gitignore index cddc716f2..6b11bed20 100644 --- a/inventory/.gitignore +++ b/inventory/.gitignore @@ -1,2 +1,2 @@ -meta.yaml +multi_ec2.yaml *pyc diff --git a/inventory/meta.yaml.example b/inventory/meta.yaml.example deleted file mode 100644 index bba26f016..000000000 --- a/inventory/meta.yaml.example +++ /dev/null @@ -1,15 +0,0 @@ -# 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 diff --git a/inventory/multi_ec2.py b/inventory/multi_ec2.py index 131d7fa76..97f158e8a 100755 --- a/inventory/multi_ec2.py +++ b/inventory/multi_ec2.py @@ -35,7 +35,7 @@ class MultiEc2(object): # get data from disk self.get_inventory_from_cache() - def load_yaml_config(self,conf_file=os.path.join(os.getcwd(),'meta.yaml')): + def load_yaml_config(self,conf_file=os.path.join(os.getcwd(),'multi_ec2.yaml')): """Load a yaml config file with credentials to query the respective cloud for inventory. """ 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