diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2014-12-12 14:55:09 -0500 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2014-12-12 14:55:09 -0500 |
| commit | f6dfc719d88fc0fd41a114f4ec0d670e962da0b8 (patch) | |
| tree | a97d77cc98af41da56fe9a4ce6395493a923f57b /inventory | |
| parent | 54de85ff38cd0e68bb669e8cebbaccc6719e3d64 (diff) | |
| download | openshift-f6dfc719d88fc0fd41a114f4ec0d670e962da0b8.tar.gz openshift-f6dfc719d88fc0fd41a114f4ec0d670e962da0b8.tar.bz2 openshift-f6dfc719d88fc0fd41a114f4ec0d670e962da0b8.tar.xz openshift-f6dfc719d88fc0fd41a114f4ec0d670e962da0b8.zip | |
In order to agree with previous renaming these naming changes were made.
Diffstat (limited to 'inventory')
| -rw-r--r-- | inventory/.gitignore | 2 | ||||
| -rwxr-xr-x | inventory/multi_ec2.py | 2 | ||||
| -rw-r--r-- | inventory/multi_ec2.yaml.example (renamed from inventory/meta.yaml.example) | 0 |
3 files changed, 2 insertions, 2 deletions
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/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/meta.yaml.example b/inventory/multi_ec2.yaml.example index bba26f016..bba26f016 100644 --- a/inventory/meta.yaml.example +++ b/inventory/multi_ec2.yaml.example |