diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2015-11-09 13:01:30 -0400 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2015-11-09 14:51:28 -0400 |
| commit | ca8a5abf71bd885a80f15f3d743eddfc6371af13 (patch) | |
| tree | 7771ff8010b07db70eb0d72a94d3d5f1c2484964 /roles/openshift_facts/tasks | |
| parent | 334c20584080abaaee9551b25a0efed1526e5e72 (diff) | |
| download | openshift-ca8a5abf71bd885a80f15f3d743eddfc6371af13.tar.gz openshift-ca8a5abf71bd885a80f15f3d743eddfc6371af13.tar.bz2 openshift-ca8a5abf71bd885a80f15f3d743eddfc6371af13.tar.xz openshift-ca8a5abf71bd885a80f15f3d743eddfc6371af13.zip | |
Read etcd data dir from appropriate config file.
Rather than assuming the etcd data dir, we now read if from master-config.yaml
if using embedded etcd, otherwise from etcd.conf.
Doing so now required use of PyYAML to parse config file when gathering facts.
Fixed discrepancy with data_dir fact and openshift-enterprise deployment_type.
Diffstat (limited to 'roles/openshift_facts/tasks')
| -rw-r--r-- | roles/openshift_facts/tasks/main.yml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/roles/openshift_facts/tasks/main.yml b/roles/openshift_facts/tasks/main.yml index a46b45b8c..a28aa7ba2 100644 --- a/roles/openshift_facts/tasks/main.yml +++ b/roles/openshift_facts/tasks/main.yml @@ -6,8 +6,11 @@ - ansible_version | version_compare('1.9.0', 'ne') - ansible_version | version_compare('1.9.0.1', 'ne') -- name: Ensure python-netaddr is installed - yum: pkg=python-netaddr state=installed +- name: Ensure python-netaddr and PyYaml are installed + yum: pkg={{ item }} state=installed + with_items: + - python-netaddr + - PyYAML - name: Gather Cluster facts openshift_facts: |