diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2015-11-03 09:37:48 -0400 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2015-11-03 09:37:48 -0400 |
| commit | d608d84361a073b2f6c3c0ba08558027cf237890 (patch) | |
| tree | 05730b875df72c97e0810efb7cf32e38812de8ac /roles | |
| parent | 078a44715b1190f4a7e0b098b0dc87446d88ac8c (diff) | |
| parent | ec31736606fc280de641e8909f03416c6b74e004 (diff) | |
| download | openshift-d608d84361a073b2f6c3c0ba08558027cf237890.tar.gz openshift-d608d84361a073b2f6c3c0ba08558027cf237890.tar.bz2 openshift-d608d84361a073b2f6c3c0ba08558027cf237890.tar.xz openshift-d608d84361a073b2f6c3c0ba08558027cf237890.zip | |
Merge branch 'upgrade' into config-upgrade
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 e5aeb9244..8cd3aa2d4 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -493,6 +493,12 @@ def set_aggregate_facts(facts): if 'cluster_public_hostname' in facts['master']: all_hostnames.add(facts['master']['cluster_public_hostname']) + 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) return facts |