diff options
| author | Samuel Munilla <smunilla@redhat.com> | 2016-08-25 09:20:17 -0400 |
|---|---|---|
| committer | Samuel Munilla <smunilla@redhat.com> | 2016-08-26 11:00:56 -0400 |
| commit | 517f3390c14bc9bf570581a914fa64ac55c1ccd9 (patch) | |
| tree | 38a2fecf60f29150cda12cdc38f4df73e47afc1d /roles | |
| parent | 2e975430061785e1acf2189e57ee7bfaee1a9411 (diff) | |
| download | openshift-517f3390c14bc9bf570581a914fa64ac55c1ccd9.tar.gz openshift-517f3390c14bc9bf570581a914fa64ac55c1ccd9.tar.bz2 openshift-517f3390c14bc9bf570581a914fa64ac55c1ccd9.tar.xz openshift-517f3390c14bc9bf570581a914fa64ac55c1ccd9.zip | |
Remove atomic check and cockpit.socket
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/cockpit-ui/tasks/main.yml | 7 | ||||
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 2 | ||||
| -rw-r--r-- | roles/openshift_facts/tasks/main.yml | 2 |
3 files changed, 2 insertions, 9 deletions
diff --git a/roles/cockpit-ui/tasks/main.yml b/roles/cockpit-ui/tasks/main.yml index 31aa3ce0b..00a7da4a9 100644 --- a/roles/cockpit-ui/tasks/main.yml +++ b/roles/cockpit-ui/tasks/main.yml @@ -42,10 +42,3 @@ register: deploy_registry_console changed_when: "'already exists' not in deploy_registry_console.stderr" failed_when: "'already exists' not in deploy_registry_console.stderr and deploy_registry_console.rc != 0" - -- name: Enable cockpit-ui - service: - name: cockpit.socket - enabled: true - state: started - when: not openshift.common.is_containerized | bool diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 805f36cec..ebd799466 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -797,7 +797,7 @@ def set_deployment_facts_if_unset(facts): curr_disabled_features = set(facts['master']['disabled_features']) facts['master']['disabled_features'] = list(curr_disabled_features.union(openshift_features)) else: - if deployment_type == 'atomic-enterprise': + if facts['common']['deployment_subtype'] == 'registry': facts['master']['disabled_features'] = openshift_features if 'node' in facts: diff --git a/roles/openshift_facts/tasks/main.yml b/roles/openshift_facts/tasks/main.yml index 725bb2160..afeb78f95 100644 --- a/roles/openshift_facts/tasks/main.yml +++ b/roles/openshift_facts/tasks/main.yml @@ -24,7 +24,7 @@ local_facts: # TODO: Deprecate deployment_type in favor of openshift_deployment_type deployment_type: "{{ openshift_deployment_type | default(deployment_type) }}" - deployment_subtype: "{{ openshift_deployment_subtype | default(deployment_subtype) }}" + deployment_subtype: "{{ openshift_deployment_subtype | default(None) }}" cluster_id: "{{ openshift_cluster_id | default('default') }}" hostname: "{{ openshift_hostname | default(None) }}" ip: "{{ openshift_ip | default(None) }}" |