summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-06-07 09:10:00 -0400
committerGitHub <noreply@github.com>2017-06-07 09:10:00 -0400
commit71dd7c814ca41bf18f3f6a52eaf13c8285ea3f24 (patch)
tree1347a230c6a64da00e0416114de271dcf705632a
parent6e50d9a9a741bd073e22d0a5877d59cec703a720 (diff)
parentd782f6dc741538dc322b980785396e061e0330b5 (diff)
downloadopenshift-71dd7c814ca41bf18f3f6a52eaf13c8285ea3f24.tar.gz
openshift-71dd7c814ca41bf18f3f6a52eaf13c8285ea3f24.tar.bz2
openshift-71dd7c814ca41bf18f3f6a52eaf13c8285ea3f24.tar.xz
openshift-71dd7c814ca41bf18f3f6a52eaf13c8285ea3f24.zip
Merge pull request #4369 from giuseppe/fix-etcd-system-container
Merged by openshift-bot
-rw-r--r--playbooks/common/openshift-master/config.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index 60cf56108..ddc4db8f8 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -117,6 +117,7 @@
| oo_collect('openshift.common.hostname')
| default(none, true) }}"
openshift_master_hosts: "{{ groups.oo_masters_to_config }}"
+ r_etcd_common_etcd_runtime: "{{ openshift.common.etcd_runtime }}"
etcd_ca_host: "{{ groups.oo_etcd_to_config.0 }}"
etcd_cert_subdir: "openshift-master-{{ openshift.common.hostname }}"
etcd_cert_config_dir: "{{ openshift.common.config_base }}/master"