diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-08-09 23:13:52 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-08-09 23:13:52 +0000 |
commit | 62b6b91b96eb29bba60f3be647c834f748108037 (patch) | |
tree | 5133dd535b5237bf1be63e1978229b487049316c | |
parent | 760e858d7642944626b99241cfe8cfadf390b036 (diff) | |
parent | 5caebe85e91bc22586cde872b4ed68943fc74a63 (diff) |
Merge "Use clustercheck credentials to poll galera state in container"
-rw-r--r-- | manifests/profile/pacemaker/clustercheck.pp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/manifests/profile/pacemaker/clustercheck.pp b/manifests/profile/pacemaker/clustercheck.pp index 958f4a2..c08bafc 100644 --- a/manifests/profile/pacemaker/clustercheck.pp +++ b/manifests/profile/pacemaker/clustercheck.pp @@ -26,14 +26,19 @@ # (Optional) The address that the local mysql instance should bind to. # Defaults to hiera('mysql_bind_host') # +# [*clustercheck_user*] +# (Optional) The name of the clustercheck user. +# Defaults to 'clustercheck' +# # [*clustercheck_password*] # (Optional) The password for the clustercheck user. -# Defaults to hiera('mysql::server::root_password') +# Defaults to hiera('mysql_clustercheck_password') # # class tripleo::profile::pacemaker::clustercheck ( $step = Integer(hiera('step')), - $clustercheck_password = hiera('mysql::server::root_password'), + $clustercheck_user = 'clustercheck', + $clustercheck_password = hiera('mysql_clustercheck_password'), $bind_address = hiera('mysql_bind_host'), ) { @@ -43,7 +48,7 @@ class tripleo::profile::pacemaker::clustercheck ( mode => '0600', owner => 'mysql', group => 'mysql', - content => "MYSQL_USERNAME=root\n + content => "MYSQL_USERNAME=${clustercheck_user}\n MYSQL_PASSWORD='${clustercheck_password}'\n MYSQL_HOST=localhost\n", } |