From 43fa4eff62f2497e3ac4dc589e657fbf15dd40ab Mon Sep 17 00:00:00 2001
From: Andrew Butcher <abutcher@redhat.com>
Date: Wed, 20 Apr 2016 12:20:12 -0400
Subject: Use openshift_hostname/openshift_ip values for etcd configuration and
 certificates.

---
 playbooks/common/openshift-etcd/config.yml   | 8 +++++---
 playbooks/common/openshift-master/config.yml | 2 +-
 playbooks/common/openshift-node/config.yml   | 4 +++-
 3 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'playbooks')

diff --git a/playbooks/common/openshift-etcd/config.yml b/playbooks/common/openshift-etcd/config.yml
index 2f07b2f51..01c092625 100644
--- a/playbooks/common/openshift-etcd/config.yml
+++ b/playbooks/common/openshift-etcd/config.yml
@@ -22,6 +22,8 @@
       etcd_cert_subdir: etcd-{{ openshift.common.hostname }}
       etcd_cert_config_dir: /etc/etcd
       etcd_cert_prefix:
+      etcd_hostname: "{{ openshift.common.hostname }}"
+      etcd_ip: "{{ openshift.common.ip }}"
 
 - name: Create temp directory for syncing certs
   hosts: localhost
@@ -43,7 +45,7 @@
                                   | oo_filter_list(filter_attr='etcd_server_certs_missing') }}"
     sync_tmpdir: "{{ hostvars.localhost.g_etcd_mktemp.stdout }}"
   roles:
-  - etcd_certificates
+  - openshift_etcd_certificates
   post_tasks:
   - name: Create a tarball of the etcd certs
     command: >
@@ -69,7 +71,7 @@
     sync_tmpdir: "{{ hostvars.localhost.g_etcd_mktemp.stdout }}"
     etcd_url_scheme: https
     etcd_peer_url_scheme: https
-    etcd_peers_group: oo_etcd_to_config
+    etcd_peers: "{{ groups.oo_etcd_to_config | default([], true) }}"
   pre_tasks:
   - name: Ensure certificate directory exists
     file:
@@ -91,7 +93,7 @@
     sync_tmpdir: "{{ hostvars.localhost.g_etcd_mktemp.stdout }}"
     etcd_url_scheme: https
     etcd_peer_url_scheme: https
-    etcd_peers_group: oo_etcd_to_config
+    etcd_peers: "{{ groups.oo_etcd_to_config | default([], true) }}"
   pre_tasks:
   - name: Ensure certificate directory exists
     file:
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index f1eaf8e16..463627168 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -98,7 +98,7 @@
                                    | oo_filter_list(filter_attr='etcd_client_certs_missing') }}"
     sync_tmpdir: "{{ hostvars.localhost.g_master_mktemp.stdout }}"
   roles:
-  - etcd_certificates
+  - openshift_etcd_certificates
   post_tasks:
   - name: Create a tarball of the etcd certs
     command: >
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
-- 
cgit v1.2.3