diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-30 14:22:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-30 14:22:06 -0700 |
| commit | f4724095b84de7dfd88df2541941edf5d674ffd8 (patch) | |
| tree | 2db2db4291f584eb52a1b32da35f62f69c1cad11 | |
| parent | f5594776a2cde617316597f5d4a5ffe85dfc8b18 (diff) | |
| parent | 041cfa825275ab9e03c58bdf8899254fbbc9f1e1 (diff) | |
| download | openshift-f4724095b84de7dfd88df2541941edf5d674ffd8.tar.gz openshift-f4724095b84de7dfd88df2541941edf5d674ffd8.tar.bz2 openshift-f4724095b84de7dfd88df2541941edf5d674ffd8.tar.xz openshift-f4724095b84de7dfd88df2541941edf5d674ffd8.zip | |
Merge pull request #5915 from sdodson/bz1507061
Automatic merge from submit-queue.
Correctly install cockpit
Seems this was changed inadvertantly in #5378
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1507061
| -rw-r--r-- | playbooks/common/openshift-master/additional_config.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/playbooks/common/openshift-master/additional_config.yml b/playbooks/common/openshift-master/additional_config.yml index e1472ce38..350557f19 100644 --- a/playbooks/common/openshift-master/additional_config.yml +++ b/playbooks/common/openshift-master/additional_config.yml @@ -28,7 +28,7 @@ when: openshift_use_manageiq | default(true) | bool - role: cockpit when: - - openshift.common.is_atomic + - not openshift.common.is_atomic | bool - deployment_type == 'openshift-enterprise' - osm_use_cockpit is undefined or osm_use_cockpit | bool - openshift.common.deployment_subtype != 'registry' |