From 6284719dac025be2f9fcc6b3373e342f8866495f Mon Sep 17 00:00:00 2001 From: Feng Pan Date: Thu, 16 Mar 2017 09:59:21 -0400 Subject: 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 --- manifests/profile/base/etcd.pp | 7 ------- 1 file changed, 7 deletions(-) (limited to 'manifests') 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', } } -- cgit 1.2.3-korg