diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-11-04 16:22:11 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-11-04 16:22:11 -0500 |
| commit | 5feca78a410fe0e5d87bc697cecd542af1c6adeb (patch) | |
| tree | 248f5e2b2ae1d5f491747750021cd2e90a29f035 /roles | |
| parent | 896b9c63292a50dce8e7aa00a889dfd52a3a8474 (diff) | |
| parent | 75d357c9bba120221a5f996660aa4fdbb87f1fa8 (diff) | |
| download | openshift-5feca78a410fe0e5d87bc697cecd542af1c6adeb.tar.gz openshift-5feca78a410fe0e5d87bc697cecd542af1c6adeb.tar.bz2 openshift-5feca78a410fe0e5d87bc697cecd542af1c6adeb.tar.xz openshift-5feca78a410fe0e5d87bc697cecd542af1c6adeb.zip | |
Merge pull request #792 from dgoodwin/upgrade
Upgrade Improvements
Diffstat (limited to 'roles')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 28866bd48..1b2ba6be3 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -510,6 +510,12 @@ def set_aggregate_facts(facts): all_hostnames.add(first_svc_ip) internal_hostnames.add(first_svc_ip) + if facts['master']['embedded_etcd']: + facts['master']['etcd_data_dir'] = os.path.join( + facts['common']['data_dir'], 'openshift.local.etcd') + else: + facts['master']['etcd_data_dir'] = '/var/lib/etcd' + facts['common']['all_hostnames'] = list(all_hostnames) facts['common']['internal_hostnames'] = list(all_hostnames) |