summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-11-06 13:26:23 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2015-11-06 13:26:23 -0500
commit60e81d59f34bebd596ede20c55d4fbaeafd25686 (patch)
tree33c9a68611d94c579a89f54fbd779e971492624e
parentd8883bca77ce55238b6a36c5cd80934dc603e596 (diff)
parent9e1bfdda7746db342d62920212784d07289bc437 (diff)
downloadopenshift-60e81d59f34bebd596ede20c55d4fbaeafd25686.tar.gz
openshift-60e81d59f34bebd596ede20c55d4fbaeafd25686.tar.bz2
openshift-60e81d59f34bebd596ede20c55d4fbaeafd25686.tar.xz
openshift-60e81d59f34bebd596ede20c55d4fbaeafd25686.zip
Merge pull request #831 from detiber/oops
Fix data_dir for 3.0 deployments
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 134734a65..1ba5fc13b 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -551,6 +551,8 @@ 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']:
+ data_dir = '/var/lib/openshift'
facts['common']['data_dir'] = data_dir
for role in ('master', 'node'):