diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-30 08:04:36 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-30 08:04:36 -0800 |
| commit | b1828482c9ed63a387dbbfa59930192424a15fa4 (patch) | |
| tree | 41bb0a84e5ab22ea26d63f9a3dafc13eb3b48f9c | |
| parent | 1dc61697707d43435523a14dda5abe304b198b49 (diff) | |
| parent | d88559b6133aa22397f010615587031c66ab873a (diff) | |
| download | openshift-b1828482c9ed63a387dbbfa59930192424a15fa4.tar.gz openshift-b1828482c9ed63a387dbbfa59930192424a15fa4.tar.bz2 openshift-b1828482c9ed63a387dbbfa59930192424a15fa4.tar.xz openshift-b1828482c9ed63a387dbbfa59930192424a15fa4.zip | |
Merge pull request #6927 from sdodson/1538974
Automatic merge from submit-queue.
Don't deploy the console if disabled or registry subtype
Whenever openshift_deployment_subtype == registry or the console is explicitly listed as a disabled feature don't deploy.
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1538974
| -rw-r--r-- | playbooks/init/basic_facts.yml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/playbooks/init/basic_facts.yml b/playbooks/init/basic_facts.yml index 06a4e7291..a9bf06693 100644 --- a/playbooks/init/basic_facts.yml +++ b/playbooks/init/basic_facts.yml @@ -67,3 +67,11 @@ first_master_client_binary: "{{ openshift_client_binary }}" #Some roles may require this to be set for first master openshift_client_binary: "{{ openshift_client_binary }}" + +- name: Disable web console if required + hosts: oo_masters_to_config + gather_facts: no + tasks: + - set_fact: + openshift_web_console_install: False + when: openshift_deployment_subtype == 'registry' or ( osm_disabled_features is defined and 'WebConsole' in osm_disabled_features ) |