summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-node
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2016-04-20 12:20:12 -0400
committerAndrew Butcher <abutcher@redhat.com>2016-04-20 12:42:48 -0400
commit43fa4eff62f2497e3ac4dc589e657fbf15dd40ab (patch)
tree243f7d83aa92508a2212830133ff1af6c49ae6b4 /playbooks/common/openshift-node
parent1f490c2374038669df3d2bfcb01af54361f8907e (diff)
downloadopenshift-43fa4eff62f2497e3ac4dc589e657fbf15dd40ab.tar.gz
openshift-43fa4eff62f2497e3ac4dc589e657fbf15dd40ab.tar.bz2
openshift-43fa4eff62f2497e3ac4dc589e657fbf15dd40ab.tar.xz
openshift-43fa4eff62f2497e3ac4dc589e657fbf15dd40ab.zip
Use openshift_hostname/openshift_ip values for etcd configuration and certificates.
Diffstat (limited to 'playbooks/common/openshift-node')
-rw-r--r--playbooks/common/openshift-node/config.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index 7ca941732..4bc98374d 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -154,6 +154,8 @@
etcd_cert_subdir: openshift-node-{{ openshift.common.hostname }}
etcd_cert_config_dir: "{{ openshift.common.config_base }}/node"
etcd_cert_prefix: node.etcd-
+ etcd_hostname: "{{ openshift.common.hostname }}"
+ etcd_ip: "{{ openshift.common.ip }}"
when: groups.oo_etcd_to_config is defined and groups.oo_etcd_to_config and (openshift.common.use_flannel | bool)
- name: Configure flannel etcd certificates
@@ -168,7 +170,7 @@
| oo_filter_list(filter_attr='etcd_client_flannel_certs_missing') | default([]) }}"
when: etcd_client_flannel_certs_missing is defined and etcd_client_flannel_certs_missing
roles:
- - role: etcd_certificates
+ - role: openshift_etcd_certificates
when: openshift_use_flannel | default(false) | bool
post_tasks:
- name: Create a tarball of the etcd flannel certs