summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts
diff options
context:
space:
mode:
authorSamuel Munilla <smunilla@redhat.com>2016-08-25 09:20:17 -0400
committerSamuel Munilla <smunilla@redhat.com>2016-08-26 11:00:56 -0400
commit517f3390c14bc9bf570581a914fa64ac55c1ccd9 (patch)
tree38a2fecf60f29150cda12cdc38f4df73e47afc1d /roles/openshift_facts
parent2e975430061785e1acf2189e57ee7bfaee1a9411 (diff)
downloadopenshift-517f3390c14bc9bf570581a914fa64ac55c1ccd9.tar.gz
openshift-517f3390c14bc9bf570581a914fa64ac55c1ccd9.tar.bz2
openshift-517f3390c14bc9bf570581a914fa64ac55c1ccd9.tar.xz
openshift-517f3390c14bc9bf570581a914fa64ac55c1ccd9.zip
Remove atomic check and cockpit.socket
Diffstat (limited to 'roles/openshift_facts')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py2
-rw-r--r--roles/openshift_facts/tasks/main.yml2
2 files changed, 2 insertions, 2 deletions
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) }}"