From 5390499e692a3a12a60507e359384c44b1ea6784 Mon Sep 17 00:00:00 2001
From: Giulio Fidente <gfidente@redhat.com>
Date: Wed, 20 May 2015 10:19:28 -0400
Subject: Use clustercheck script to control galera-ready

The exec timeout/attempts is configured so that it is
left running for up to 30mins if the command runs but is
unsuccessfull and up to 2h if the command times out.

Change-Id: I4b6b77e878017bf92d7c59c868d393e74405a355
---
 overcloud-without-mergepy.yaml | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'overcloud-without-mergepy.yaml')

diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index d3f8c59d..70e197d2 100644
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -598,7 +598,6 @@ resources:
           MysqlClusterUniquePart: {get_attr: [MysqlClusterUniquePart, value]}
           MysqlInnodbBufferPoolSize: {get_param: MysqlInnodbBufferPoolSize}
           MysqlRootPassword: {get_attr: [MysqlRootPassword, value]}
-          MysqlClustercheckPassword: {get_attr: [MysqlClustercheckPassword, value]}
           NeutronPublicInterfaceIP: {get_param: NeutronPublicInterfaceIP}
           NeutronFlatNetworks: {get_param: NeutronFlatNetworks}
           NeutronBridgeMappings: {get_param: NeutronBridgeMappings}
@@ -761,11 +760,6 @@ resources:
     properties:
       length: 10
 
-  MysqlClustercheckPassword:
-    type: OS::Heat::RandomString
-    properties:
-      length: 10
-
   MysqlClusterUniquePart:
     type: OS::Heat::RandomString
     properties:
-- 
cgit 1.2.3-korg