diff options
| author | Wesley Hearn <wesley.s.hearn@gmail.com> | 2016-01-07 09:00:05 -0500 |
|---|---|---|
| committer | Wesley Hearn <wesley.s.hearn@gmail.com> | 2016-01-07 09:00:05 -0500 |
| commit | 2d13cea12a01caaea20d4bae874db7ee7beaf22f (patch) | |
| tree | 2d7b640e9d90df7054d82aa462ce37e99057bbd9 | |
| parent | 42b0745b1d7a6727fa7df62afb452c67f7c8c8e6 (diff) | |
| parent | 003610cd859ed3714079a804db5a4329c96ac09d (diff) | |
| download | openshift-2d13cea12a01caaea20d4bae874db7ee7beaf22f.tar.gz openshift-2d13cea12a01caaea20d4bae874db7ee7beaf22f.tar.bz2 openshift-2d13cea12a01caaea20d4bae874db7ee7beaf22f.tar.xz openshift-2d13cea12a01caaea20d4bae874db7ee7beaf22f.zip | |
Merge pull request #1127 from wshearn/update_config_base_online
Update openshift_facts config_base for Online deployments
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 4 |
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'): |