diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-01-29 11:31:46 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-01-29 11:31:46 -0500 |
| commit | 9f7299d6f704995cb25eb225d23499f7a6385392 (patch) | |
| tree | afcf718a046da4d71fa3b84b7a145596e0a5c0a6 /playbooks/common | |
| parent | cc1a07226cdcdaa31a9b97d07ef5f0b3d9987f07 (diff) | |
| parent | 9a4c6f01f86ade7b9d6420ba1c6a7c6e7a679295 (diff) | |
| download | openshift-9f7299d6f704995cb25eb225d23499f7a6385392.tar.gz openshift-9f7299d6f704995cb25eb225d23499f7a6385392.tar.bz2 openshift-9f7299d6f704995cb25eb225d23499f7a6385392.tar.xz openshift-9f7299d6f704995cb25eb225d23499f7a6385392.zip | |
Merge pull request #1307 from abutcher/containerized-cockpit
Enable cockpit when not is_atomic.
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index a0d21451f..12497bf94 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -368,7 +368,7 @@ cockpit_plugins: "{{ osm_cockpit_plugins | default(['cockpit-kubernetes']) }}" roles: - role: cockpit - when: not openshift.common.is_containerized and ( deployment_type in ['atomic-enterprise','openshift-enterprise'] ) and + when: not openshift.common.is_atomic and ( deployment_type in ['atomic-enterprise','openshift-enterprise'] ) and (osm_use_cockpit | bool or osm_use_cockpit is undefined ) - name: Configure flannel |