diff options
author | Jason DeTiberus <jdetiber@redhat.com> | 2015-11-06 16:56:37 -0500 |
---|---|---|
committer | Jason DeTiberus <jdetiber@redhat.com> | 2015-11-10 22:35:29 -0500 |
commit | 4c1b0dd4ab8f3a5d4fcfa4ba1501ed374793e77a (patch) | |
tree | 3ddcde311f1a47bb692e13fdefb1c5fe5f3d11cd /utils/src/ooinstall/oo_config.py | |
parent | 586972b427061433ba6a1cde94228c257d84164e (diff) | |
download | openshift-4c1b0dd4ab8f3a5d4fcfa4ba1501ed374793e77a.tar.gz openshift-4c1b0dd4ab8f3a5d4fcfa4ba1501ed374793e77a.tar.bz2 openshift-4c1b0dd4ab8f3a5d4fcfa4ba1501ed374793e77a.tar.xz openshift-4c1b0dd4ab8f3a5d4fcfa4ba1501ed374793e77a.zip |
Refactor upgrade playbook(s)
- Split playbooks into two, one for 3.0 minor upgrades and one for 3.0 to 3.1
upgrades
- Move upgrade playbooks to common/openshift/cluster/upgrades from adhoc
- Added a byo wrapper playbooks to set the groups based on the byo
conventions, other providers will need similar playbooks added eventually
- installer wrapper updates for refactored upgrade playbooks
- call new 3.0 to 3.1 upgrade playbook
- various fixes for edge cases I hit with a really old config laying
around.
- fix output of host facts to show connect_to value.
Diffstat (limited to 'utils/src/ooinstall/oo_config.py')
-rw-r--r-- | utils/src/ooinstall/oo_config.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/utils/src/ooinstall/oo_config.py b/utils/src/ooinstall/oo_config.py index cf51bb404..9c97e6e93 100644 --- a/utils/src/ooinstall/oo_config.py +++ b/utils/src/ooinstall/oo_config.py @@ -116,6 +116,9 @@ class OOConfig(object): def _upgrade_legacy_config(self): new_hosts = [] + remove_settings = ['validated_facts', 'Description', 'Name', + 'Subscription', 'Vendor', 'Version', 'masters', 'nodes'] + if 'validated_facts' in self.settings: for key, value in self.settings['validated_facts'].iteritems(): value['connect_to'] = key @@ -126,10 +129,9 @@ class OOConfig(object): new_hosts.append(value) self.settings['hosts'] = new_hosts - remove_settings = ['validated_facts', 'Description', 'Name', - 'Subscription', 'Vendor', 'Version', 'masters', 'nodes'] for s in remove_settings: - del self.settings[s] + if s in self.settings: + del self.settings[s] # A legacy config implies openshift-enterprise 3.0: self.settings['variant'] = 'openshift-enterprise' |