summaryrefslogtreecommitdiffstats
path: root/manifests/profile
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-20 21:51:42 +0000
committerGerrit Code Review <review@openstack.org>2016-10-20 21:51:42 +0000
commit39bdd043be41f8aa98ebdf720ac6e5faebde7ac9 (patch)
tree3c273de6a7e07281ad30a416ff6a79134eca0788 /manifests/profile
parentb70323a681f952239ed83d2acabb2c9d8da80f6e (diff)
parent381e59f6e15ab4cb5316e0be3ba831fe61b318d2 (diff)
Merge "pacemaker/mysql: wait step 2 to remove default accounts"
Diffstat (limited to 'manifests/profile')
-rw-r--r--manifests/profile/pacemaker/database/mysql.pp12
1 files changed, 11 insertions, 1 deletions
diff --git a/manifests/profile/pacemaker/database/mysql.pp b/manifests/profile/pacemaker/database/mysql.pp
index 7464854..a353e5f 100644
--- a/manifests/profile/pacemaker/database/mysql.pp
+++ b/manifests/profile/pacemaker/database/mysql.pp
@@ -89,9 +89,19 @@ class tripleo::profile::pacemaker::database::mysql (
}
}
+ # remove_default_accounts parameter will execute some mysql commands
+ # to remove the default accounts created by MySQL package.
+ # We need MySQL running to run the commands successfully, so better to
+ # wait step 2 before trying to run the commands.
+ if $step >= 2 and $pacemaker_master {
+ $remove_default_accounts = true
+ } else {
+ $remove_default_accounts = false
+ }
+
class { '::tripleo::profile::base::database::mysql':
manage_resources => false,
- remove_default_accounts => $pacemaker_master,
+ remove_default_accounts => $remove_default_accounts,
mysql_server_options => $mysqld_options,
}