Merge "Make packstack compatible with latest puppetlabs-mysql module"

packstack/puppet/templates/cinder_qpid.pp

@@ -9,4 +9,5 @@ class {'cinder':
     sql_connection => "mysql://cinder:%(CONFIG_CINDER_DB_PW)s@%(CONFIG_MYSQL_HOST)s/cinder",
     verbose        => true,
     debug          => %(CONFIG_DEBUG_MODE)s,
+    mysql_module   => '2.2',
 }

packstack/puppet/templates/cinder_rabbitmq.pp

@@ -7,4 +7,5 @@ class {'cinder':
     sql_connection   => "mysql://cinder:%(CONFIG_CINDER_DB_PW)s@%(CONFIG_MYSQL_HOST)s/cinder",
     verbose          => true,
     debug            => %(CONFIG_DEBUG_MODE)s,
+    mysql_module   => '2.2',
 }

packstack/puppet/templates/glance.pp

@@ -8,6 +8,7 @@ class {"glance::api":
     sql_connection => "mysql://glance:%(CONFIG_GLANCE_DB_PW)s@%(CONFIG_MYSQL_HOST)s/glance",
     verbose => true,
     debug => %(CONFIG_DEBUG_MODE)s,
+    mysql_module => '2.2',
 }
 
 class { 'glance::backend::file': }
@@ -20,4 +21,5 @@ class {"glance::registry":
     sql_connection => "mysql://glance:%(CONFIG_GLANCE_DB_PW)s@%(CONFIG_MYSQL_HOST)s/glance",
     verbose => true,
     debug => %(CONFIG_DEBUG_MODE)s,
+    mysql_module => '2.2',
 }

packstack/puppet/templates/glance_ceilometer_rabbitmq.pp

@@ -2,7 +2,7 @@
 class { 'glance::notify::rabbitmq':
     rabbit_host      => '%(CONFIG_AMQP_HOST)s',
     rabbit_port      => '%(CONFIG_AMQP_CLIENTS_PORT)s',
-    rabbit_use_ssl   => '%(CONFIG_AMQP_ENABLE_SSL)s',
+    rabbit_use_ssl   => %(CONFIG_AMQP_ENABLE_SSL)s,
     rabbit_userid    => '%(CONFIG_AMQP_AUTH_USER)s',
     rabbit_password  => '%(CONFIG_AMQP_AUTH_PASSWORD)s',
 }

packstack/puppet/templates/keystone.pp

@@ -5,6 +5,7 @@ class {"keystone":
     token_format => "%(CONFIG_KEYSTONE_TOKEN_FORMAT)s",
     verbose => true,
     debug => %(CONFIG_DEBUG_MODE)s,
+    mysql_module => '2.2',
 }
 
 class {"keystone::roles::admin":

packstack/puppet/templates/mysql_cinder_install.pp

@@ -3,4 +3,5 @@ class {"cinder::db::mysql":
   host          => "%%",
   allowed_hosts => "%%",
   charset       => "utf8",
+  mysql_module  => '2.2',
 }

packstack/puppet/templates/mysql_glance_install.pp

@@ -3,4 +3,5 @@ class {"glance::db::mysql":
   host          => "%%",
   allowed_hosts => "%%",
   charset       => "utf8",
+  mysql_module  => '2.2',
 }

packstack/puppet/templates/mysql_heat_install.pp

@@ -3,4 +3,5 @@ class {"heat::db::mysql":
   host          => "%%",
   allowed_hosts => "%%",
   charset       => "utf8",
+  mysql_module  => '2.2',
 }

packstack/puppet/templates/mysql_install.pp

@@ -13,11 +13,17 @@ if $::operatingsystem in ['RedHat','CentOS','Scientific'] and $::operatingsystem
 }
 
 class {"mysql::server":
-    package_name => "mariadb-galera-server",
-    manage_service => $manage_service,
-    config_hash => {bind_address => "0.0.0.0",
-                    default_engine => "InnoDB",
-                    root_password => "%(CONFIG_MYSQL_PW)s",}
+    package_name     => "mariadb-galera-server",
+    service_manage   => $manage_service,
+    restart          => true,
+    root_password    => "%(CONFIG_MYSQL_PW)s",
+    override_options => {
+      'mysqld' => { bind_address => "0.0.0.0",
+                    default_storage_engine => "InnoDB",
+                    max_connections => "1024",
+                    open_files_limit => '-1',
+      }
+    }
 }
 
 include packstack::innodb
@@ -26,15 +32,15 @@ include packstack::innodb
 # this is done in mysql::server::account_security but has problems
 # when there is no fqdn, so we're defining a slightly different one here
 database_user { [ 'root@127.0.0.1', 'root@::1', '@localhost', '@%%' ]:
-    ensure  => 'absent', require => Class['mysql::config'],
+    ensure  => 'absent', require => Class['mysql::server'],
 }
 if ($::fqdn != "" and $::fqdn != "localhost") {
     database_user { [ "root@${::fqdn}", "@${::fqdn}"]:
-        ensure  => 'absent', require => Class['mysql::config'],
+        ensure  => 'absent', require => Class['mysql::server'],
     }
 }
 if ($::fqdn != $::hostname and $::hostname != "localhost") {
     database_user { ["root@${::hostname}", "@${::hostname}"]:
-        ensure  => 'absent', require => Class['mysql::config'],
+        ensure  => 'absent', require => Class['mysql::server'],
     }
 }

packstack/puppet/templates/mysql_keystone_install.pp

@@ -3,4 +3,5 @@ class {"keystone::db::mysql":
     password      => "%(CONFIG_KEYSTONE_DB_PW)s",
     allowed_hosts => "%%",
     charset       => "utf8",
+    mysql_module  => '2.2',
 }

packstack/puppet/templates/mysql_neutron_install.pp

@@ -4,4 +4,5 @@ class {"neutron::db::mysql":
   allowed_hosts => "%%",
   dbname        => '%(CONFIG_NEUTRON_L2_DBNAME)s',
   charset       => "utf8",
+  mysql_module  => '2.2',
 }

packstack/puppet/templates/mysql_nova_install.pp

@@ -3,4 +3,5 @@ class {"nova::db::mysql":
   host          => "%%",
   allowed_hosts => "%%",
   charset       => "utf8",
+  mysql_module  => '2.2',
 }

packstack/puppet/templates/neutron_api.pp

@@ -4,6 +4,7 @@ class { 'neutron::server':
   auth_password => $neutron_user_password,
   auth_host => '%(CONFIG_CONTROLLER_HOST)s',
   enabled => true,
+  mysql_module   => '2.2',
 }
 
 exec { 'neutron-db-manage upgrade':