diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-08-11 14:02:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-11 14:02:28 -0400 |
| commit | e92887433366a212abd1388f0daea7cf1d576292 (patch) | |
| tree | 50750d7a5d18bd527af117e845a09d7c63f0f514 | |
| parent | 3409e6db205b6b24914e16c62972de50071f4051 (diff) | |
| parent | 31a7bb1b37a302b6856d02fd289c9a6dff41318d (diff) | |
| download | openshift-e92887433366a212abd1388f0daea7cf1d576292.tar.gz openshift-e92887433366a212abd1388f0daea7cf1d576292.tar.bz2 openshift-e92887433366a212abd1388f0daea7cf1d576292.tar.xz openshift-e92887433366a212abd1388f0daea7cf1d576292.zip | |
Merge pull request #4984 from abutcher/etcd-scaleup-tweaks
Use etcd_hostname/ip vars for etcd scaleup registration
| -rw-r--r-- | playbooks/common/openshift-etcd/scaleup.yml | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/playbooks/common/openshift-etcd/scaleup.yml b/playbooks/common/openshift-etcd/scaleup.yml index 47fa8cdf5..192305bc8 100644 --- a/playbooks/common/openshift-etcd/scaleup.yml +++ b/playbooks/common/openshift-etcd/scaleup.yml @@ -1,4 +1,13 @@ --- +- name: Gather facts + hosts: oo_etcd_to_config:oo_new_etcd_to_config + roles: + - openshift_etcd_facts + post_tasks: + - set_fact: + etcd_hostname: "{{ etcd_hostname }}" + etcd_ip: "{{ etcd_ip }}" + - name: Configure etcd hosts: oo_new_etcd_to_config serial: 1 @@ -8,11 +17,11 @@ pre_tasks: - name: Add new etcd members to cluster command: > - /usr/bin/etcdctl --cert-file {{ etcd_peer_cert_file }} - --key-file {{ etcd_peer_key_file }} - --ca-file {{ etcd_peer_ca_file }} - -C {{ etcd_peer_url_scheme }}://{{ etcd_ca_host }}:{{ etcd_client_port }} - member add {{ inventory_hostname }} {{ etcd_peer_url_scheme }}://{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}:{{ etcd_peer_port }} + /usr/bin/etcdctl --cert-file {{ etcd_peer_cert_file }} + --key-file {{ etcd_peer_key_file }} + --ca-file {{ etcd_peer_ca_file }} + -C {{ etcd_peer_url_scheme }}://{{ hostvars[etcd_ca_host].etcd_hostname }}:{{ etcd_client_port }} + member add {{ etcd_hostname }} {{ etcd_peer_url_scheme }}://{{ etcd_ip }}:{{ etcd_peer_port }} delegate_to: "{{ etcd_ca_host }}" register: etcd_add_check roles: @@ -23,7 +32,6 @@ etcd_certificates_etcd_hosts: "{{ groups.oo_etcd_to_config | default([], true) }}" etcd_initial_cluster_state: "existing" initial_etcd_cluster: "{{ etcd_add_check.stdout_lines[3] | regex_replace('ETCD_INITIAL_CLUSTER=','') }}" - etcd_hostname: "{{ inventory_hostname }}" etcd_ca_setup: False r_etcd_common_etcd_runtime: "{{ openshift.common.etcd_runtime }}" - role: nickhammond.logrotate |