summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorWesley Hearn <whearn@redhat.com>2016-01-07 08:52:13 -0500
committerWesley Hearn <whearn@redhat.com>2016-01-07 08:52:13 -0500
commit003610cd859ed3714079a804db5a4329c96ac09d (patch)
tree3b074c89819dd352fd01a6d03a235d477f8cdb15 /roles
parentd197b6343ab042e606bf890b1e360cb680108a03 (diff)
downloadopenshift-003610cd859ed3714079a804db5a4329c96ac09d.tar.gz
openshift-003610cd859ed3714079a804db5a4329c96ac09d.tar.bz2
openshift-003610cd859ed3714079a804db5a4329c96ac09d.tar.xz
openshift-003610cd859ed3714079a804db5a4329c96ac09d.zip
Update openshift_facts config_base for Online deployments
Diffstat (limited to 'roles')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py4
1 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 0b57439e7..8dc16f5e4 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -628,7 +628,7 @@ def set_deployment_facts_if_unset(facts):
facts['common']['service_type'] = service_type
if 'config_base' not in facts['common']:
config_base = '/etc/origin'
- if deployment_type in ['enterprise', 'online']:
+ if deployment_type in ['enterprise']:
config_base = '/etc/openshift'
# Handle upgrade scenarios when symlinks don't yet exist:
if not os.path.exists(config_base) and os.path.exists('/etc/openshift'):
@@ -636,7 +636,7 @@ def set_deployment_facts_if_unset(facts):
facts['common']['config_base'] = config_base
if 'data_dir' not in facts['common']:
data_dir = '/var/lib/origin'
- if deployment_type in ['enterprise', 'online']:
+ if deployment_type in ['enterprise']:
data_dir = '/var/lib/openshift'
# Handle upgrade scenarios when symlinks don't yet exist:
if not os.path.exists(data_dir) and os.path.exists('/var/lib/openshift'):