Create clustercheck after mysql-server

- Under some circumstances clustercheck user/files are created before
  mysql-server is fully set up. This patch changes the behavior to
  create user after mysql-server
- Create my.cnf primary controller. It only helps to bootstrap the
  cluster. After all we link it to our my.localhost.cnf. We don't need
  to set it up on non primary controllers.

Change-Id: I97de2a01b79851eeca34524c92f406c99ea56cda
Closes-Bug: 1571763
Closes-Bug: 1577462
Signed-off-by: Sergii Golovatiuk <sgolovatiuk@mirantis.com>

deployment/puppet/openstack/manifests/galera/status.pp

@@ -59,7 +59,7 @@ class openstack::galera::status (
   mysql_user { "${status_user}@${status_allow}":
     ensure        => 'present',
     password_hash => mysql_password($status_password),
-    require       => [File["${::root_home}/.my.cnf"],Service['mysqld']],
+    require       => Anchor['mysql::server::end'],
   } ->
   mysql_grant { "${status_user}@${status_allow}/*.*":
     ensure     => 'present',
@@ -67,7 +67,6 @@ class openstack::galera::status (
     privileges => [ 'USAGE' ],
     table      => '*.*',
     user       => "${status_user}@${status_allow}",
-    before     => Anchor['mysql::server::end'],
   }
 
   file { '/etc/wsrepclustercheckrc':
@@ -75,7 +74,7 @@ class openstack::galera::status (
     owner   => 'nobody',
     group   => 'nogroup',
     mode    => '0400',
-    before  => Anchor['mysql::server::end'],
+    require => Anchor['mysql::server::end'],
   }
 
   augeas { 'galeracheck':
@@ -86,7 +85,7 @@ class openstack::galera::status (
       "set /files/etc/services/service-name[port = '${port}']/protocol tcp",
       "set /files/etc/services/service-name[port = '${port}']/#comment 'Galera Cluster Check'",
     ],
-    before  => Anchor['mysql::server::end'],
+    require => Anchor['mysql::server::end'],
   }
 
   $group = $::osfamily ? {
@@ -106,7 +105,7 @@ class openstack::galera::status (
     user       => 'nobody',
     group      => $group,
     flags      => 'IPv4',
-    require    => Augeas['galeracheck'],
-    before     => Anchor['mysql::server::end'],
+    require    => [ Augeas['galeracheck'],
+                    Anchor['mysql::server::end']],
   }
 }

deployment/puppet/osnailyfacter/manifests/database/database.pp

@@ -261,7 +261,7 @@ class osnailyfacter::database::database {
       mysql_port            => $backend_port,
       root_password         => $mysql_root_password,
       create_root_user      => $primary_controller,
-      create_root_my_cnf    => true,
+      create_root_my_cnf    => $primary_controller,
       configure_repo        => false, # NOTE: repos should be managed via fuel
       configure_firewall    => false,
       validate_connection   => false,
@@ -348,8 +348,9 @@ class osnailyfacter::database::database {
       }
     }
 
-    Class['::openstack::galera::status'] ->
-      ::Osnailyfacter::Wait_for_backend['mysql']
+    Class['::cluster::mysql'] ->
+      Class['::openstack::galera::status'] ->
+        ::Osnailyfacter::Wait_for_backend['mysql']
   }
 
 }

tests/noop/spec/hosts/database/database_spec.rb

@@ -132,7 +132,7 @@ describe manifest do
         :galera_master => false,
         :mysql_port => '3307',
         :root_password => mysql_database_password,
-        :create_root_my_cnf => true,
+        :create_root_my_cnf => primary_controller,
         :create_root_user => primary_controller,
         :validate_connection => false,
         :status_check => false,