aboutsummaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-04 19:02:23 +0000
committerGerrit Code Review <review@openstack.org>2017-04-04 19:02:23 +0000
commit09881742f05be92a23633522582bb4bb95471117 (patch)
treeface40898ad3c71acc7f914f13347c5d119c4aa7 /manifests
parent32620c52c8d82c30158df4f63a37ace9f6ade890 (diff)
parent6284719dac025be2f9fcc6b3373e342f8866495f (diff)
Merge "Remove cluster_enabled setting for etcd"
Diffstat (limited to 'manifests')
-rw-r--r--manifests/profile/base/etcd.pp7
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',
}
}