From 8e0fd5033c0897a11abb5d9948b5ad77bdccacfa Mon Sep 17 00:00:00 2001 From: Feng Pan Date: Mon, 31 Jul 2017 15:05:28 -0400 Subject: nosdn-fdio scenario fixes - Add vpp_physnet_mappings function - Change etcd deployment model Change-Id: Ie336c22b366bd478963ca14e25d645fec0cded7a Signed-off-by: Feng Pan --- manifests/profile/base/etcd.pp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'manifests/profile/base/etcd.pp') diff --git a/manifests/profile/base/etcd.pp b/manifests/profile/base/etcd.pp index 505e29f..c29c937 100644 --- a/manifests/profile/base/etcd.pp +++ b/manifests/profile/base/etcd.pp @@ -46,20 +46,13 @@ class tripleo::profile::base::etcd ( $nodes = hiera('etcd_node_names', []), $step = hiera('step'), ) { - if $step >= 1 { - if count($nodes) > 1 { - $cluster_enabled = true - } else { - $cluster_enabled = false - } - + if $step >= 2 { 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