diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-15 06:28:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-15 06:28:07 -0700 |
| commit | 1720af442f0b02359ce4cc70d32adca15d9d26ab (patch) | |
| tree | 40f9ae16e07d7c959c9de2bcb7b3f62759a1d902 /playbooks/common | |
| parent | ff8fd31446bbfa4944a60f661f4aca8041bec813 (diff) | |
| parent | 641be9236ef8bf7cb4eb27b2d333bdf9aef8e0a5 (diff) | |
| download | openshift-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 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-etcd/scaleup.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/playbooks/common/openshift-etcd/scaleup.yml b/playbooks/common/openshift-etcd/scaleup.yml index 58848a81b..20061366c 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 |