From f326278f05d030ee2b2ce2368c1386540a1bcc47 Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Fri, 18 Sep 2015 13:47:44 -0400
Subject: Update origin paths for v1.0.6
Origin now uses /etc/origin and /var/lib/origin as of v1.0.6. The RPMs will
create a symlinks from /etc/origin to /etc/openshift and /var/lib/origin to
/var/lib/openshift if the openshift directories exist. However on clean installs
/etc/openshift won't exist.
---
roles/openshift_facts/library/openshift_facts.py | 6 +-----
1 file changed, 1 insertion(+), 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'):
--
cgit v1.2.3