summaryrefslogtreecommitdiffstats
path: root/playbooks/adhoc
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2015-11-09 13:01:30 -0400
committerDevan Goodwin <dgoodwin@redhat.com>2015-11-09 14:51:28 -0400
commitca8a5abf71bd885a80f15f3d743eddfc6371af13 (patch)
tree7771ff8010b07db70eb0d72a94d3d5f1c2484964 /playbooks/adhoc
parent334c20584080abaaee9551b25a0efed1526e5e72 (diff)
downloadopenshift-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 'playbooks/adhoc')
-rw-r--r--playbooks/adhoc/upgrades/upgrade.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/playbooks/adhoc/upgrades/upgrade.yml b/playbooks/adhoc/upgrades/upgrade.yml
index 1b6b5757c..03b9193c0 100644
--- a/playbooks/adhoc/upgrades/upgrade.yml
+++ b/playbooks/adhoc/upgrades/upgrade.yml
@@ -150,7 +150,7 @@
- name: Ensure python-yaml present for config upgrade
yum:
- pkg: python-yaml
+ pkg: PyYAML
state: installed
- name: Upgrade master configuration