summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-09-18 14:06:51 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2015-09-18 14:06:51 -0400
commit8f6c6824073dff0cea3cd793db2745fb6cf52931 (patch)
tree66023f596e9ebb180b9b0210eb01fdea82b9585a
parent6b333d1531c3bce454050aeb1a3803a09205a997 (diff)
parentf326278f05d030ee2b2ce2368c1386540a1bcc47 (diff)
downloadopenshift-8f6c6824073dff0cea3cd793db2745fb6cf52931.tar.gz
openshift-8f6c6824073dff0cea3cd793db2745fb6cf52931.tar.bz2
openshift-8f6c6824073dff0cea3cd793db2745fb6cf52931.tar.xz
openshift-8f6c6824073dff0cea3cd793db2745fb6cf52931.zip
Merge pull request #595 from sdodson/v106-changes
Update origin paths for v1.0.6
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 60d1226d4..991b8da66 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -461,7 +461,7 @@ def set_deployment_facts_if_unset(facts):
if 'service_type' not in facts['common']:
service_type = 'atomic-openshift'
if deployment_type == 'origin':
- service_type = 'openshift'
+ service_type = 'origin'
elif deployment_type in ['enterprise', 'online']:
service_type = 'openshift'
facts['common']['service_type'] = service_type
@@ -469,15 +469,11 @@ def set_deployment_facts_if_unset(facts):
config_base = '/etc/origin'
if deployment_type in ['enterprise', 'online']:
config_base = '/etc/openshift'
- elif deployment_type == 'origin':
- config_base = '/etc/openshift'
facts['common']['config_base'] = config_base
if 'data_dir' not in facts['common']:
data_dir = '/var/lib/origin'
if deployment_type in ['enterprise', 'online']:
data_dir = '/var/lib/openshift'
- elif deployment_type == 'origin':
- data_dir = '/var/lib/openshift'
facts['common']['data_dir'] = data_dir
for role in ('master', 'node'):