diff options
| author | Jan Chaloupka <jchaloup@redhat.com> | 2017-10-13 15:33:15 +0200 |
|---|---|---|
| committer | Jan Chaloupka <jchaloup@redhat.com> | 2017-10-13 15:33:15 +0200 |
| commit | 641be9236ef8bf7cb4eb27b2d333bdf9aef8e0a5 (patch) | |
| tree | 079a9cd08d2f37c17c40793d18e80ac915fdf8e7 | |
| parent | 12469e264fc10b17fb837b6c15e3c211a21aef3f (diff) | |
| download | openshift-641be9236ef8bf7cb4eb27b2d333bdf9aef8e0a5.tar.gz openshift-641be9236ef8bf7cb4eb27b2d333bdf9aef8e0a5.tar.bz2 openshift-641be9236ef8bf7cb4eb27b2d333bdf9aef8e0a5.tar.xz openshift-641be9236ef8bf7cb4eb27b2d333bdf9aef8e0a5.zip | |
set initial etcd cluster properly during system container scale up
| -rw-r--r-- | playbooks/common/openshift-etcd/scaleup.yml | 2 | ||||
| -rw-r--r-- | roles/etcd/tasks/system_container.yml | 1 | ||||
| -rw-r--r-- | roles/etcd/templates/etcd.conf.j2 | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/playbooks/common/openshift-etcd/scaleup.yml b/playbooks/common/openshift-etcd/scaleup.yml index b5ba2bbba..54d0b67cf 100644 --- a/playbooks/common/openshift-etcd/scaleup.yml +++ b/playbooks/common/openshift-etcd/scaleup.yml @@ -46,7 +46,7 @@ etcd_ca_host: "{{ groups.oo_etcd_to_config.0 }}" 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=','') | regex_replace('\"','') }}" + etcd_initial_cluster: "{{ etcd_add_check.stdout_lines[3] | regex_replace('ETCD_INITIAL_CLUSTER=','') | regex_replace('\"','') }}" etcd_ca_setup: False r_etcd_common_etcd_runtime: "{{ openshift.common.etcd_runtime }}" - role: nickhammond.logrotate diff --git a/roles/etcd/tasks/system_container.yml b/roles/etcd/tasks/system_container.yml index e735bf50a..024479fb4 100644 --- a/roles/etcd/tasks/system_container.yml +++ b/roles/etcd/tasks/system_container.yml @@ -17,6 +17,7 @@ {{ hostvars[host].etcd_hostname }}={{ etcd_peer_url_scheme }}://{{ hostvars[host].etcd_ip }}:{{ etcd_peer_port }}, {%- endif -%} {% endfor -%} + when: etcd_initial_cluster is undefined - name: Check etcd system container package command: > diff --git a/roles/etcd/templates/etcd.conf.j2 b/roles/etcd/templates/etcd.conf.j2 index 8462bb4c8..3027a9447 100644 --- a/roles/etcd/templates/etcd.conf.j2 +++ b/roles/etcd/templates/etcd.conf.j2 @@ -29,8 +29,8 @@ ETCD_INITIAL_CLUSTER={{ etcd_hostname}}={{ etcd_initial_advertise_peer_urls }} ETCD_INITIAL_CLUSTER_STATE={{ etcd_initial_cluster_state }} ETCD_INITIAL_CLUSTER_TOKEN=thirdparty-etcd-cluster-1 {% else %} -{% if initial_etcd_cluster is defined and initial_etcd_cluster %} -ETCD_INITIAL_CLUSTER={{ initial_etcd_cluster }} +{% if etcd_initial_cluster is defined and etcd_initial_cluster %} +ETCD_INITIAL_CLUSTER={{ etcd_initial_cluster }} {% else %} ETCD_INITIAL_CLUSTER={{ initial_cluster() }} {% endif %} |