From: Feng Pan <fpan@redhat.com>
Date: Tue, 7 Mar 2017 14:43:14 +0000 (-0500)
Subject: Move etcd to step 2
X-Git-Tag: opnfv-6.0.0~244^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e5fe7a5ac180257cdf70dcba2d820f3ca0f749d3;p=apex-puppet-tripleo.git

Move etcd to step 2

Etcd should be configured and started in step 2 with other core
services when required.

Change-Id: If95a74d211a194f2bfbe9653a6e19e05b095a210
Signed-off-by: Feng Pan <fpan@redhat.com>
---

diff --git a/manifests/profile/base/etcd.pp b/manifests/profile/base/etcd.pp
index fc4771f..c29c937 100644
--- a/manifests/profile/base/etcd.pp
+++ b/manifests/profile/base/etcd.pp
@@ -46,7 +46,7 @@ class tripleo::profile::base::etcd (
   $nodes       = hiera('etcd_node_names', []),
   $step        = hiera('step'),
 ) {
-  if $step >= 1 {
+  if $step >= 2 {
     class {'::etcd':
       listen_client_urls          => "http://${bind_ip}:${client_port}",
       advertise_client_urls       => "http://${bind_ip}:${client_port}",