summaryrefslogtreecommitdiffstats
path: root/roles/etcd
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-15 06:28:07 -0700
committerGitHub <noreply@github.com>2017-10-15 06:28:07 -0700
commit1720af442f0b02359ce4cc70d32adca15d9d26ab (patch)
tree40f9ae16e07d7c959c9de2bcb7b3f62759a1d902 /roles/etcd
parentff8fd31446bbfa4944a60f661f4aca8041bec813 (diff)
parent641be9236ef8bf7cb4eb27b2d333bdf9aef8e0a5 (diff)
downloadopenshift-1720af442f0b02359ce4cc70d32adca15d9d26ab.tar.gz
openshift-1720af442f0b02359ce4cc70d32adca15d9d26ab.tar.bz2
openshift-1720af442f0b02359ce4cc70d32adca15d9d26ab.tar.xz
openshift-1720af442f0b02359ce4cc70d32adca15d9d26ab.zip
Merge pull request #5747 from ingvagabund/set-initial-etcd-cluster-properly-system-container-scale-up
Automatic merge from submit-queue. Set initial etcd cluster properly during system container scale up When a cluster is scaled up, the ETCD_INITIAL_CLUSTER must not contain etcd members that are not about to start or are not part of the etcd cluster. Consolidating `initial_etcd_cluster` and `etcd_initial_cluster` as they do exactly the same. Bug: 1500667
Diffstat (limited to 'roles/etcd')
-rw-r--r--roles/etcd/tasks/system_container.yml1
-rw-r--r--roles/etcd/templates/etcd.conf.j24
2 files changed, 3 insertions, 2 deletions
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 %}