diff options
| author | Avesh Agarwal <avagarwa@redhat.com> | 2015-06-19 14:41:10 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2015-11-04 19:57:21 -0500 |
| commit | 399b19864653806c769ac954a6c79ef13a895d64 (patch) | |
| tree | bc5fa83250dc30da5cc7338f4ce1abb30778dbcf /roles/openshift_facts | |
| parent | 5feca78a410fe0e5d87bc697cecd542af1c6adeb (diff) | |
| download | openshift-399b19864653806c769ac954a6c79ef13a895d64.tar.gz openshift-399b19864653806c769ac954a6c79ef13a895d64.tar.bz2 openshift-399b19864653806c769ac954a6c79ef13a895d64.tar.xz openshift-399b19864653806c769ac954a6c79ef13a895d64.zip | |
Atomic Enterprise related changes.
Diffstat (limited to 'roles/openshift_facts')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 1b2ba6be3..24ae5183e 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -540,7 +540,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 = 'origin' + service_type = 'openshift' elif deployment_type in ['enterprise', 'online']: service_type = 'openshift' facts['common']['service_type'] = service_type @@ -548,6 +548,8 @@ 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' |