summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-11-23 11:59:52 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2015-11-23 11:59:52 -0500
commit2f40603022b55e9986422b9467949aae340bb6ab (patch)
treed9aac53b50b3a26f2c83a9396fa347f5acc43b29
parent8e979def0a56b40ab8a3acbd2e1a146457a5aaa6 (diff)
parentbc9a52fcc1b27379c093eac5d8b63e87c0511c35 (diff)
downloadopenshift-2f40603022b55e9986422b9467949aae340bb6ab.tar.gz
openshift-2f40603022b55e9986422b9467949aae340bb6ab.tar.bz2
openshift-2f40603022b55e9986422b9467949aae340bb6ab.tar.xz
openshift-2f40603022b55e9986422b9467949aae340bb6ab.zip
Merge pull request #957 from detiber/upgradeFix
Add serviceAccountConfig.masterCA during 3.1 upgrade
-rwxr-xr-xplaybooks/common/openshift-cluster/upgrades/library/openshift_upgrade_config.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/library/openshift_upgrade_config.py b/playbooks/common/openshift-cluster/upgrades/library/openshift_upgrade_config.py
index a6721bb92..9a065fd1c 100755
--- a/playbooks/common/openshift-cluster/upgrades/library/openshift_upgrade_config.py
+++ b/playbooks/common/openshift-cluster/upgrades/library/openshift_upgrade_config.py
@@ -78,6 +78,10 @@ def upgrade_master_3_0_to_3_1(ansible_module, config_base, backup):
config['kubernetesMasterConfig'].pop('apiLevels')
changes.append('master-config.yaml: removed kubernetesMasterConfig.apiLevels')
+ # Add masterCA to serviceAccountConfig
+ if 'serviceAccountConfig' in config and 'masterCA' not in config['serviceAccountConfig']:
+ config['serviceAccountConfig']['masterCA'] = config['oauthConfig'].get('masterCA', 'ca.crt')
+
# Add proxyClientInfo to master-config
if 'proxyClientInfo' not in config['kubernetesMasterConfig']:
config['kubernetesMasterConfig']['proxyClientInfo'] = {