diff options
author | Thomas Wiest <twiest@redhat.com> | 2015-12-09 15:48:15 -0500 |
---|---|---|
committer | Thomas Wiest <twiest@redhat.com> | 2015-12-09 15:48:15 -0500 |
commit | 14c69ad397be8ee101ef5b4edfa223d703e67ad0 (patch) | |
tree | 70eee046db8012061c178ab4e686650048265564 /roles/etcd_common | |
parent | 898290cb3aabbc9d98883181877ac857a2fe1faf (diff) | |
parent | b7b3e6dbdfd17e55055630ce963965818e830620 (diff) | |
download | openshift-14c69ad397be8ee101ef5b4edfa223d703e67ad0.tar.gz openshift-14c69ad397be8ee101ef5b4edfa223d703e67ad0.tar.bz2 openshift-14c69ad397be8ee101ef5b4edfa223d703e67ad0.tar.xz openshift-14c69ad397be8ee101ef5b4edfa223d703e67ad0.zip |
Merge remote-tracking branch 'upstream/master' into prod
Diffstat (limited to 'roles/etcd_common')
-rw-r--r-- | roles/etcd_common/defaults/main.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/etcd_common/defaults/main.yml b/roles/etcd_common/defaults/main.yml index 96f4b63af..3af509448 100644 --- a/roles/etcd_common/defaults/main.yml +++ b/roles/etcd_common/defaults/main.yml @@ -1,5 +1,5 @@ --- -etcd_peers_group: etcd +etcd_peers_group: oo_etcd_to_config # etcd server vars etcd_conf_dir: /etc/etcd |