diff --git a/manifests/common/cinder.pp b/manifests/common/cinder.pp index 3421429f..593d742a 100644 --- a/manifests/common/cinder.pp +++ b/manifests/common/cinder.pp @@ -14,7 +14,6 @@ rabbit_password => $::openstack::config::rabbitmq_password, debug => $::openstack::config::debug, verbose => $::openstack::config::verbose, - mysql_module => '2.2', } $storage_server = $::openstack::config::storage_address_api diff --git a/manifests/common/keystone.pp b/manifests/common/keystone.pp index d4cbf730..020ef3b5 100644 --- a/manifests/common/keystone.pp +++ b/manifests/common/keystone.pp @@ -23,7 +23,6 @@ debug => $::openstack::config::debug, enabled => $::openstack::profile::base::is_controller, admin_bind_host => $admin_bind_host, - mysql_module => '2.2', service_name => $service_name, } diff --git a/manifests/common/neutron.pp b/manifests/common/neutron.pp index d0d90ed6..d02be3e4 100644 --- a/manifests/common/neutron.pp +++ b/manifests/common/neutron.pp @@ -45,7 +45,6 @@ database_connection => $database_connection, enabled => $is_controller, sync_db => $is_controller, - mysql_module => '2.2', } if $::osfamily == 'redhat' { diff --git a/manifests/common/nova.pp b/manifests/common/nova.pp index cdea324e..951c4e4d 100644 --- a/manifests/common/nova.pp +++ b/manifests/common/nova.pp @@ -24,7 +24,6 @@ rabbit_password => $::openstack::config::rabbitmq_password, debug => $::openstack::config::debug, verbose => $::openstack::config::verbose, - mysql_module => '2.2', } nova_config { 'DEFAULT/default_floating_pool': value => 'public' } diff --git a/manifests/profile/glance/api.pp b/manifests/profile/glance/api.pp index 1db0a4f2..332ef35b 100644 --- a/manifests/profile/glance/api.pp +++ b/manifests/profile/glance/api.pp @@ -39,7 +39,6 @@ keystone_user => 'glance', verbose => $::openstack::config::verbose, debug => $::openstack::config::debug, - mysql_module => '2.2', } class { '::glance::notify::rabbitmq': diff --git a/manifests/profile/heat/api.pp b/manifests/profile/heat/api.pp index 121884bc..e0020f25 100644 --- a/manifests/profile/heat/api.pp +++ b/manifests/profile/heat/api.pp @@ -35,7 +35,6 @@ verbose => $::openstack::config::verbose, keystone_host => $::openstack::config::controller_address_management, keystone_password => $::openstack::config::heat_password, - mysql_module => '2.2', } class { '::heat::api': diff --git a/manifests/resources/database.pp b/manifests/resources/database.pp index 64cec1f4..efe3eeb9 100644 --- a/manifests/resources/database.pp +++ b/manifests/resources/database.pp @@ -7,7 +7,6 @@ password => $password, dbname => $title, allowed_hosts => $::openstack::config::mysql_allowed_hosts, - mysql_module => '2.2', require => Anchor['database-service'], } }