diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2015-11-06 11:36:17 -0500 |
|---|---|---|
| committer | Jason DeTiberus <jdetiber@redhat.com> | 2015-11-06 11:36:17 -0500 |
| commit | 941246584a95cc4b5d5619e2b31f75923888f2f6 (patch) | |
| tree | 52655fdbb503b74a3ca8e3d34a0f1fdab28c260e /playbooks/adhoc | |
| parent | 7b405f03f75b3c03a6016024ee757c1645bf234c (diff) | |
| download | openshift-941246584a95cc4b5d5619e2b31f75923888f2f6.tar.gz openshift-941246584a95cc4b5d5619e2b31f75923888f2f6.tar.bz2 openshift-941246584a95cc4b5d5619e2b31f75923888f2f6.tar.xz openshift-941246584a95cc4b5d5619e2b31f75923888f2f6.zip | |
Fix apiLevels modifications
Diffstat (limited to 'playbooks/adhoc')
| -rwxr-xr-x | playbooks/adhoc/upgrades/library/openshift_upgrade_config.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/playbooks/adhoc/upgrades/library/openshift_upgrade_config.py b/playbooks/adhoc/upgrades/library/openshift_upgrade_config.py index 33eb40d7d..f9ee5b254 100755 --- a/playbooks/adhoc/upgrades/library/openshift_upgrade_config.py +++ b/playbooks/adhoc/upgrades/library/openshift_upgrade_config.py @@ -74,13 +74,9 @@ def upgrade_master_3_0_to_3_1(ansible_module, config_base, backup): config['apiLevels'] = result['new_list'] changes.append(result['changes']) - if 'kubernetesMasterConfig' in config: - result = modify_api_levels(config['kubernetesMasterConfig'].get('apiLevels'), - unsupported_levels, supported_levels, 'master-config.yaml:', - 'from apiLevels') - if result['changed']: - config['kubernetesMasterConfig']['apiLevels'] = result['new_list'] - changes.append(result['changes']) + if 'kubernetesMasterConfig' in config and 'apiLevels' in config['kubernetesMasterConfig']: + config['kubernetesMasterConfig'].remove('apiLevels') + changes.append('master-config.yaml: removed kubernetesMasterConfig.apiLevels') # Add proxyClientInfo to master-config if 'proxyClientInfo' not in config['kubernetesMasterConfig']: |