summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2015-05-13 16:56:29 -0400
committerKenny Woodson <kwoodson@redhat.com>2015-05-13 16:56:29 -0400
commit139d3a42fb4647d238afc7ae03a9b00347d46961 (patch)
tree764da2073c3c782dc9a359021943ec18253c86eb
parent305808da1049c603519329e66b34068686bfb99e (diff)
parentd82c71ce9a98c1e9ecabf24cd7bd7c7e19aabec2 (diff)
downloadopenshift-139d3a42fb4647d238afc7ae03a9b00347d46961.tar.gz
openshift-139d3a42fb4647d238afc7ae03a9b00347d46961.tar.bz2
openshift-139d3a42fb4647d238afc7ae03a9b00347d46961.tar.xz
openshift-139d3a42fb4647d238afc7ae03a9b00347d46961.zip
Merge pull request #224 from kwoodson/multi_ec2_fix
Added group option to multi_ec2. Also tmp file removal fix.
-rwxr-xr-xinventory/multi_ec2.py64
-rw-r--r--inventory/multi_ec2.yaml.example6
2 files changed, 53 insertions, 17 deletions
diff --git a/inventory/multi_ec2.py b/inventory/multi_ec2.py
index d251c6a6a..11247f942 100755
--- a/inventory/multi_ec2.py
+++ b/inventory/multi_ec2.py
@@ -14,6 +14,7 @@ import json
import errno
import fcntl
import tempfile
+import copy
CONFIG_FILE_NAME = 'multi_ec2.yaml'
DEFAULT_CACHE_PATH = os.path.expanduser('~/.ansible/tmp/multi_ec2_inventory.cache')
@@ -148,13 +149,13 @@ class MultiEc2(object):
'''
try:
all_results = []
- tmp_file_path = None
+ tmp_file_paths = []
processes = {}
for account in self.config['accounts']:
env = account['env_vars']
if account.has_key('provider_config'):
- tmp_file_path = MultiEc2.generate_config(account['provider_config'])
- env['EC2_INI_PATH'] = tmp_file_path
+ tmp_file_paths.append(MultiEc2.generate_config(account['provider_config']))
+ env['EC2_INI_PATH'] = tmp_file_paths[-1]
name = account['name']
provider = account['provider']
processes[name] = self.get_provider_tags(provider, env)
@@ -171,8 +172,8 @@ class MultiEc2(object):
finally:
# Clean up the mkstemp file
- if tmp_file_path:
- os.unlink(tmp_file_path)
+ for tmp_file in tmp_file_paths:
+ os.unlink(tmp_file)
return all_results
@@ -189,27 +190,58 @@ class MultiEc2(object):
provider_results = self.run_provider()
# process --host results
- if not self.args.host:
+ # For any 0 result, return it
+ if self.args.host:
+ count = 0
+ for results in provider_results:
+ if results['code'] == 0 and results['err'] == '' and results['out'] != '{}':
+ self.result = json.loads(results['out'])
+ count += 1
+ if count > 1:
+ raise RuntimeError("Found > 1 results for --host %s. \
+ This is an invalid state." % self.args.host)
+ # process --list results
+ else:
# For any non-zero, raise an error on it
for result in provider_results:
if result['code'] != 0:
raise RuntimeError(result['err'])
else:
self.all_ec2_results[result['name']] = json.loads(result['out'])
+
+ # Check if user wants extra vars in yaml by
+ # having hostvars and all_group defined
+ for acc_config in self.config['accounts']:
+ self.apply_account_config(acc_config)
+
+ # Build results by merging all dictionaries
values = self.all_ec2_results.values()
values.insert(0, self.result)
for result in values:
MultiEc2.merge_destructively(self.result, result)
- else:
- # For any 0 result, return it
- count = 0
- for results in provider_results:
- if results['code'] == 0 and results['err'] == '' and results['out'] != '{}':
- self.result = json.loads(results['out'])
- count += 1
- if count > 1:
- raise RuntimeError("Found > 1 results for --host %s. \
- This is an invalid state." % self.args.host)
+
+ def apply_account_config(self, acc_config):
+ ''' Apply account config settings
+ '''
+ if not acc_config.has_key('hostvars') and not acc_config.has_key('all_group'):
+ return
+
+ results = self.all_ec2_results[acc_config['name']]
+ # Update each hostvar with the newly desired key: value
+ for host_property, value in acc_config['hostvars'].items():
+ # Verify the account results look sane
+ # by checking for these keys ('_meta' and 'hostvars' exist)
+ if results.has_key('_meta') and results['_meta'].has_key('hostvars'):
+ for data in results['_meta']['hostvars'].values():
+ data[str(host_property)] = str(value)
+
+ # Add this group
+ results["%s_%s" % (host_property, value)] = \
+ copy.copy(results[acc_config['all_group']])
+
+ # store the results back into all_ec2_results
+ self.all_ec2_results[acc_config['name']] = results
+
@staticmethod
def merge_destructively(input_a, input_b):
"merges b into input_a"
diff --git a/inventory/multi_ec2.yaml.example b/inventory/multi_ec2.yaml.example
index c41c134ab..99f157b11 100644
--- a/inventory/multi_ec2.yaml.example
+++ b/inventory/multi_ec2.yaml.example
@@ -17,8 +17,12 @@ accounts:
env_vars:
AWS_ACCESS_KEY_ID: XXXXXXXXXXXXXXXXXXXX
AWS_SECRET_ACCESS_KEY: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ all_group: ec2
+ hostvars:
+ cloud: aws
+ account: aws1
- - name: aws2
+- name: aws2
provider: aws/hosts/ec2.py
env_vars:
AWS_ACCESS_KEY_ID: XXXXXXXXXXXXXXXXXXXX