From: Lusheng Ji <lji@research.att.com>
Date: Thu, 19 Oct 2017 04:14:58 +0000 (-0400)
Subject: Fix consul join prematurely problem
X-Git-Tag: 1.0.0-Amsterdam~26
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=dae872dcf4dfa3327ee9a089b3a1124b769ff2b8;p=dcaegen2%2Fplatform%2Fblueprints.git

Fix consul join prematurely problem

Issue-Id: DCAEGEN2-128
Change-Id: Ife91f88000652a1ce1bde55d2c78dedce83f026a
Signed-off-by: Lusheng Ji <lji@research.att.com>
---

diff --git a/blueprints/consul_cluster.yaml-template b/blueprints/consul_cluster.yaml-template
index 6bf9eaf..a4ae89e 100644
--- a/blueprints/consul_cluster.yaml-template
+++ b/blueprints/consul_cluster.yaml-template
@@ -199,9 +199,11 @@ node_templates:
                   - concat:
                       - 'until /opt/consul/bin/consul join '
                       - { get_attribute: [host_cnsl01, ip] }
-                      - ' '
+                      - '; do sleep 5; done; '
+                  - concat:
+                      - 'until /opt/consul/bin/consul join '
                       - { get_attribute: [host_cnsl02, ip]}
-                      - '; do sleep 15; done'
+                      - '; do sleep 5; done'
 
     relationships:
       - type: cloudify.openstack.server_connected_to_port