diff options
| author |   Feng Pan <fpan@redhat.com> | 2017-03-16 09:59:21 -0400 |
|---|---|---|
| committer | Feng Pan <fpan@redhat.com> | 2017-03-16 10:25:49 -0400 |
| commit | 6284719dac025be2f9fcc6b3373e342f8866495f (patch) | |
| tree | f6bec5d278735a4395519300dbbcec14719111f8 | |
| parent | ed5b0274d6babc626ff4f968a31f2aa910401e94 (diff) | |
Remove cluster_enabled setting for etcd
Setting cluster_enabled to false causes ETCD_INITIAL_ADVERTISE_PEER_URLS
to be unset, which will cause deployment failure when etcd is deployed
in a single node mode.
Closes-Bug: #1673188
Change-Id: Iadff36bf7beb247d0408913c89f83fa5c8ac6874
Signed-off-by: Feng Pan <fpan@redhat.com>
| -rw-r--r-- | manifests/profile/base/etcd.pp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/manifests/profile/base/etcd.pp b/manifests/profile/base/etcd.pp index 505e29f..fc4771f 100644 --- a/manifests/profile/base/etcd.pp +++ b/manifests/profile/base/etcd.pp @@ -47,19 +47,12 @@ class tripleo::profile::base::etcd ( $step = hiera('step'), ) { if $step >= 1 { - if count($nodes) > 1 { - $cluster_enabled = true - } else { - $cluster_enabled = false - } - class {'::etcd': listen_client_urls => "http://${bind_ip}:${client_port}", advertise_client_urls => "http://${bind_ip}:${client_port}", listen_peer_urls => "http://${bind_ip}:${peer_port}", initial_advertise_peer_urls => "http://${bind_ip}:${peer_port}", initial_cluster => regsubst($nodes, '.+', "\\0=http://\\0:${peer_port}"), - cluster_enabled => $cluster_enabled, proxy => 'off', } } |