From 9aed16cea13f4ffa32a92056273fb425ddeccb5b Mon Sep 17 00:00:00 2001 From: Vitalii Kovalchuk Date: Tue, 11 Oct 2016 13:26:06 +0000 Subject: [PATCH] Remove cassandra seed check Change-Id: I49c05ff2dae0cd8fab0d88bbef8fa60ab94bef60 Closes-Bug: #1632238 --- .../puppet/modules/contrail/manifests/database.pp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/deployment_scripts/puppet/modules/contrail/manifests/database.pp b/deployment_scripts/puppet/modules/contrail/manifests/database.pp index d754f84bd..cbc405d6e 100644 --- a/deployment_scripts/puppet/modules/contrail/manifests/database.pp +++ b/deployment_scripts/puppet/modules/contrail/manifests/database.pp @@ -150,21 +150,12 @@ class contrail::database { subscribe => File['/etc/cassandra/cassandra.yaml'] } - $cassandra_seed = $cassandra_seeds[0] - exec { 'wait_for_cassandra_seed': - provider => 'shell', - command => "nodetool status|grep ^UN|grep ${cassandra_seed}", - tries => 10, # wait for whole cluster is up: 10 tries every 30 seconds = 5 min - try_sleep => 30, - require => Service['supervisor-database'], - } - exec { 'wait_for_cassandra': provider => 'shell', command => "nodetool status|grep ^UN|grep ${contrail::address}", tries => 10, # wait for whole cluster is up: 10 tries every 30 seconds = 5 min try_sleep => 30, - require => [Service['supervisor-database'],Exec['wait_for_cassandra_seed']] + require => Exec['wait_for_cassandra_seed'] } Package['contrail-openstack-database'] -> Contrail_database_nodemgr_config <||> Contrail_database_nodemgr_config <||> ~> Service['supervisor-database']