diff options
| -rw-r--r-- | .tito/packages/openshift-ansible | 2 | ||||
| -rwxr-xr-x | inventory/multi_inventory.py | 34 | ||||
| -rw-r--r-- | openshift-ansible.spec | 20 |
3 files changed, 39 insertions, 17 deletions
diff --git a/.tito/packages/openshift-ansible b/.tito/packages/openshift-ansible index 51ee78d34..71c04689a 100644 --- a/.tito/packages/openshift-ansible +++ b/.tito/packages/openshift-ansible @@ -1 +1 @@ -3.0.14-1 ./ +3.0.15-1 ./ diff --git a/inventory/multi_inventory.py b/inventory/multi_inventory.py index 354a8c10c..232f2402d 100755 --- a/inventory/multi_inventory.py +++ b/inventory/multi_inventory.py @@ -288,26 +288,30 @@ class MultiInventory(object): results = self.all_inventory_results[acc_config['name']] results['all_hosts'] = results['_meta']['hostvars'].keys() - # Update each hostvar with the newly desired key: value from extra_* - for _extra in ['extra_vars', 'extra_groups']: - for new_var, value in acc_config.get(_extra, {}).items(): - for data in results['_meta']['hostvars'].values(): - self.add_entry(data, new_var, value) - - # Add this group - if _extra == 'extra_groups': - results["%s_%s" % (new_var, value)] = copy.copy(results['all_hosts']) - - # Clone groups goes here - for to_name, from_name in acc_config.get('clone_groups', {}).items(): - if results.has_key(from_name): - results[to_name] = copy.copy(results[from_name]) + # Extra vars go here + for new_var, value in acc_config.get('extra_vars', {}).items(): + for data in results['_meta']['hostvars'].values(): + self.add_entry(data, new_var, value) - # Clone vars goes here + # Clone vars go here for to_name, from_name in acc_config.get('clone_vars', {}).items(): for data in results['_meta']['hostvars'].values(): self.add_entry(data, to_name, self.get_entry(data, from_name)) + # Extra groups go here + for new_var, value in acc_config.get('extra_groups', {}).items(): + for data in results['_meta']['hostvars'].values(): + results["%s_%s" % (new_var, value)] = copy.copy(results['all_hosts']) + + # Clone groups go here + # Build a group based on the desired key name + for to_name, from_name in acc_config.get('clone_groups', {}).items(): + for name, data in results['_meta']['hostvars'].items(): + key = '%s_%s' % (to_name, self.get_entry(data, from_name)) + if not results.has_key(key): + results[key] = [] + results[key].append(name) + # store the results back into all_inventory_results self.all_inventory_results[acc_config['name']] = results diff --git a/openshift-ansible.spec b/openshift-ansible.spec index fef7aab79..ea9cc91bd 100644 --- a/openshift-ansible.spec +++ b/openshift-ansible.spec @@ -5,7 +5,7 @@ } Name: openshift-ansible -Version: 3.0.14 +Version: 3.0.15 Release: 1%{?dist} Summary: Openshift and Atomic Enterprise Ansible License: ASL 2.0 @@ -258,6 +258,24 @@ Atomic OpenShift Utilities includes %changelog +* Fri Nov 20 2015 Kenny Woodson <kwoodson@redhat.com> 3.0.15-1 +- Fixing clone group functionality. Also separating extra_vars from + extra_groups (kwoodson@redhat.com) +- Check the end result on bad config file (smunilla@redhat.com) +- Add some tests for a bad config (smunilla@redhat.com) +- atomic-openshift-installer: connect_to error handling (smunilla@redhat.com) +- atomic-openshift-installer: pylint fixes (smunilla@redhat.com) +- Replace map with oo_collect to support python-jinja2 <2.7 + (abutcher@redhat.com) +- Making the uninstall playbook more flexible (bleanhar@redhat.com) +- Install version dependent image streams for v1.0 and v1.1 + (sdodson@redhat.com) +- Do not update the hostname (jdetiber@redhat.com) +- Pylint fix for long line in cli docstring. (dgoodwin@redhat.com) +- Default to installing OSE 3.1 instead of 3.0. (dgoodwin@redhat.com) +- Fix tests on systems with openshift-ansible rpms installed. + (dgoodwin@redhat.com) + * Thu Nov 19 2015 Brenton Leanhardt <bleanhar@redhat.com> 3.0.14-1 - added metric items to zabbix for openshift online (mwoodson@redhat.com) - Updating usergroups to accept users (kwoodson@redhat.com) |