summaryrefslogtreecommitdiffstats
path: root/playbooks/adhoc
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2015-11-04 15:49:57 -0400
committerDevan Goodwin <dgoodwin@redhat.com>2015-11-04 15:49:57 -0400
commitabab19316ff270d090e27a1fb576b78889e5563c (patch)
tree47168a34662f85bc0935141496bb02fe3b0be7b8 /playbooks/adhoc
parent153c57d6bda48276bc1f8be520145780fa119941 (diff)
downloadopenshift-abab19316ff270d090e27a1fb576b78889e5563c.tar.gz
openshift-abab19316ff270d090e27a1fb576b78889e5563c.tar.bz2
openshift-abab19316ff270d090e27a1fb576b78889e5563c.tar.xz
openshift-abab19316ff270d090e27a1fb576b78889e5563c.zip
Disable proxy cert config upgrade until certs being generated.
Diffstat (limited to 'playbooks/adhoc')
-rwxr-xr-xplaybooks/adhoc/upgrades/library/openshift_upgrade_config.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/playbooks/adhoc/upgrades/library/openshift_upgrade_config.py b/playbooks/adhoc/upgrades/library/openshift_upgrade_config.py
index 95c7b1664..357f244e0 100755
--- a/playbooks/adhoc/upgrades/library/openshift_upgrade_config.py
+++ b/playbooks/adhoc/upgrades/library/openshift_upgrade_config.py
@@ -49,11 +49,12 @@ def upgrade_master_3_0_to_3_1(backup):
changed = True
# Add the new master proxy client certs:
- if 'proxyClientInfo' not in config['kubernetesMasterConfig']:
- config['kubernetesMasterConfig']['proxyClientInfo'] = {
- 'certFile': 'master.proxy-client.crt',
- 'keyFile': 'master.proxy-client.key'
- }
+ # TODO: re-enable this once these certs are generated during upgrade:
+# if 'proxyClientInfo' not in config['kubernetesMasterConfig']:
+# config['kubernetesMasterConfig']['proxyClientInfo'] = {
+# 'certFile': 'master.proxy-client.crt',
+# 'keyFile': 'master.proxy-client.key'
+# }
if changed:
if backup: