diff options
| author | Tim Bielawa <tbielawa@redhat.com> | 2017-07-26 13:21:18 -0400 |
|---|---|---|
| committer | Tim Bielawa <tbielawa@redhat.com> | 2017-07-28 15:21:26 -0400 |
| commit | 88c946de1ce8299fa8cda05c537e1f90a4c29512 (patch) | |
| tree | 9ed0fa2b2c8d98925972b49a1b47b4b80164e4fa /roles/openshift_master/vars | |
| parent | f0abc3268bcc0f33cd6539d870c6231d4028082d (diff) | |
| download | openshift-88c946de1ce8299fa8cda05c537e1f90a4c29512.tar.gz openshift-88c946de1ce8299fa8cda05c537e1f90a4c29512.tar.bz2 openshift-88c946de1ce8299fa8cda05c537e1f90a4c29512.tar.xz openshift-88c946de1ce8299fa8cda05c537e1f90a4c29512.zip | |
Use existing OPENSHIFT_DEFAULT_REGISTRY setting during masters scaleup
Fixes a bug which reported that AFTER a cluster upgrade from OCP 3.5
to 3.6, any masters which are later added via the scaleup playbooks
are setting a value for OPENSHIFT_DEFAULT_REGISTRY which is
inconsistent with the already configured masters.
* OPENSHIFT_DEFAULT_REGISTRY value is saved from oo_first_master
* The new scaleup master has a fact set noting it is a scaleup host
* The saved OPENSHIFT_DEFAULT_REGISTRY value is used instead of the
default for 3.6, which is to use a hard-coded registry value of
'docker-registry.default.svc:5000'
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1469336
Diffstat (limited to 'roles/openshift_master/vars')
| -rw-r--r-- | roles/openshift_master/vars/main.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/roles/openshift_master/vars/main.yml b/roles/openshift_master/vars/main.yml index c5ba20409..7745d014f 100644 --- a/roles/openshift_master/vars/main.yml +++ b/roles/openshift_master/vars/main.yml @@ -20,3 +20,4 @@ openshift_master_valid_grant_methods: - deny l_is_ha: "{{ openshift.master.ha is defined and openshift.master.ha | bool }}" +openshift_master_is_scaleup_host: False |