diff --git a/packstack/puppet/templates/cinder_qpid.pp b/packstack/puppet/templates/cinder_qpid.pp
index e31f3df6d..3bcac0efc 100644
--- a/packstack/puppet/templates/cinder_qpid.pp
+++ b/packstack/puppet/templates/cinder_qpid.pp
@@ -2,14 +2,13 @@ $cinder_qpid_cfg_cinder_db_pw = hiera('CONFIG_CINDER_DB_PW')
 $cinder_qpid_cfg_mariadb_host = hiera('CONFIG_MARIADB_HOST')
 
 class {'cinder':
-  rpc_backend    => 'cinder.openstack.common.rpc.impl_qpid',
-  qpid_hostname  => hiera('CONFIG_AMQP_HOST'),
-  qpid_port      => hiera('CONFIG_AMQP_CLIENTS_PORT'),
-  qpid_protocol  => hiera('CONFIG_AMQP_PROTOCOL'),
-  qpid_username  => hiera('CONFIG_AMQP_AUTH_USER'),
-  qpid_password  => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
-  sql_connection => "mysql://cinder:${cinder_qpid_cfg_cinder_db_pw}@${cinder_qpid_cfg_mariadb_host}/cinder",
-  verbose        => true,
-  debug          => hiera('CONFIG_DEBUG_MODE'),
-  mysql_module   => '2.2',
+  rpc_backend         => 'cinder.openstack.common.rpc.impl_qpid',
+  qpid_hostname       => hiera('CONFIG_AMQP_HOST'),
+  qpid_port           => hiera('CONFIG_AMQP_CLIENTS_PORT'),
+  qpid_protocol       => hiera('CONFIG_AMQP_PROTOCOL'),
+  qpid_username       => hiera('CONFIG_AMQP_AUTH_USER'),
+  qpid_password       => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
+  database_connection => "mysql://cinder:${cinder_qpid_cfg_cinder_db_pw}@${cinder_qpid_cfg_mariadb_host}/cinder",
+  verbose             => true,
+  debug               => hiera('CONFIG_DEBUG_MODE'),
 }
diff --git a/packstack/puppet/templates/cinder_rabbitmq.pp b/packstack/puppet/templates/cinder_rabbitmq.pp
index 58102c208..ffc32c18a 100644
--- a/packstack/puppet/templates/cinder_rabbitmq.pp
+++ b/packstack/puppet/templates/cinder_rabbitmq.pp
@@ -2,12 +2,11 @@ $cinder_rab_cfg_cinder_db_pw = hiera('CONFIG_CINDER_DB_PW')
 $cinder_rab_cfg_mariadb_host = hiera('CONFIG_MARIADB_HOST')
 
 class {'cinder':
-  rabbit_host     => hiera('CONFIG_AMQP_HOST'),
-  rabbit_port     => hiera('CONFIG_AMQP_CLIENTS_PORT'),
-  rabbit_userid   => hiera('CONFIG_AMQP_AUTH_USER'),
-  rabbit_password => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
-  sql_connection  => "mysql://cinder:${cinder_rab_cfg_cinder_db_pw}@${cinder_rab_cfg_mariadb_host}/cinder",
-  verbose         => true,
-  debug           => hiera('CONFIG_DEBUG_MODE'),
-  mysql_module    => '2.2',
+  rabbit_host         => hiera('CONFIG_AMQP_HOST'),
+  rabbit_port         => hiera('CONFIG_AMQP_CLIENTS_PORT'),
+  rabbit_userid       => hiera('CONFIG_AMQP_AUTH_USER'),
+  rabbit_password     => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
+  database_connection => "mysql://cinder:${cinder_rab_cfg_cinder_db_pw}@${cinder_rab_cfg_mariadb_host}/cinder",
+  verbose             => true,
+  debug               => hiera('CONFIG_DEBUG_MODE'),
 }
diff --git a/packstack/puppet/templates/glance.pp b/packstack/puppet/templates/glance.pp
index 2417fc3a6..9d7aaad62 100644
--- a/packstack/puppet/templates/glance.pp
+++ b/packstack/puppet/templates/glance.pp
@@ -2,25 +2,23 @@ $glance_ks_pw = hiera('CONFIG_GLANCE_DB_PW')
 $glance_mariadb_host = hiera('CONFIG_MARIADB_HOST')
 
 class { 'glance::api':
-  auth_host         => hiera('CONFIG_CONTROLLER_HOST'),
-  keystone_tenant   => 'services',
-  keystone_user     => 'glance',
-  keystone_password => hiera('CONFIG_GLANCE_KS_PW'),
-  pipeline          => 'keystone',
-  sql_connection    => "mysql://glance:${glance_ks_pw}@${glance_mariadb_host}/glance",
-  verbose           => true,
-  debug             => hiera('CONFIG_DEBUG_MODE'),
-  mysql_module      => '2.2',
+  auth_host           => hiera('CONFIG_CONTROLLER_HOST'),
+  keystone_tenant     => 'services',
+  keystone_user       => 'glance',
+  keystone_password   => hiera('CONFIG_GLANCE_KS_PW'),
+  pipeline            => 'keystone',
+  database_connection => "mysql://glance:${glance_ks_pw}@${glance_mariadb_host}/glance",
+  verbose             => true,
+  debug               => hiera('CONFIG_DEBUG_MODE'),
 }
 
 class { 'glance::registry':
-  auth_host         => hiera('CONFIG_CONTROLLER_HOST'),
-  keystone_tenant   => 'services',
-  keystone_user     => 'glance',
-  keystone_password => hiera('CONFIG_GLANCE_KS_PW'),
-  sql_connection    => "mysql://glance:${glance_ks_pw}@${glance_mariadb_host}/glance",
-  verbose           => true,
-  debug             => hiera('CONFIG_DEBUG_MODE'),
-  mysql_module      => '2.2',
+  auth_host           => hiera('CONFIG_CONTROLLER_HOST'),
+  keystone_tenant     => 'services',
+  keystone_user       => 'glance',
+  keystone_password   => hiera('CONFIG_GLANCE_KS_PW'),
+  database_connection => "mysql://glance:${glance_ks_pw}@${glance_mariadb_host}/glance",
+  verbose             => true,
+  debug               => hiera('CONFIG_DEBUG_MODE'),
 }
 
diff --git a/packstack/puppet/templates/heat_qpid.pp b/packstack/puppet/templates/heat_qpid.pp
index ae7888421..356bc2e0f 100644
--- a/packstack/puppet/templates/heat_qpid.pp
+++ b/packstack/puppet/templates/heat_qpid.pp
@@ -3,17 +3,17 @@ $heat_qpid_cfg_heat_db_pw = hiera('CONFIG_HEAT_DB_PW')
 $heat_qpid_cfg_mariadb_host = hiera('CONFIG_MARIADB_HOST')
 
 class { 'heat':
-  keystone_host     => $heat_cfn_cfg_ctrl_host,
-  keystone_password => hiera('CONFIG_HEAT_KS_PW'),
-  auth_uri          => "http://${heat_qpid_cfg_ctrl_host}:35357/v2.0",
-  keystone_ec2_uri  => "http://${heat_qpid_cfg_ctrl_host}:35357/v2.0",
-  rpc_backend       => 'heat.openstack.common.rpc.impl_qpid',
-  qpid_hostname     => hiera('CONFIG_AMQP_HOST'),
-  qpid_username     => hiera('CONFIG_AMQP_AUTH_USER'),
-  qpid_password     => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
-  qpid_port         => hiera('CONFIG_AMQP_CLIENTS_PORT'),
-  qpid_protocol     => hiera('CONFIG_AMQP_PROTOCOL'),
-  verbose           => true,
-  debug             => hiera('CONFIG_DEBUG_MODE'),
-  sql_connection    => "mysql://heat:${heat_qpid_cfg_heat_db_pw}@${heat_qpid_cfg_mariadb_host}/heat",
+  keystone_host       => $heat_cfn_cfg_ctrl_host,
+  keystone_password   => hiera('CONFIG_HEAT_KS_PW'),
+  auth_uri            => "http://${heat_qpid_cfg_ctrl_host}:35357/v2.0",
+  keystone_ec2_uri    => "http://${heat_qpid_cfg_ctrl_host}:35357/v2.0",
+  rpc_backend         => 'heat.openstack.common.rpc.impl_qpid',
+  qpid_hostname       => hiera('CONFIG_AMQP_HOST'),
+  qpid_username       => hiera('CONFIG_AMQP_AUTH_USER'),
+  qpid_password       => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
+  qpid_port           => hiera('CONFIG_AMQP_CLIENTS_PORT'),
+  qpid_protocol       => hiera('CONFIG_AMQP_PROTOCOL'),
+  verbose             => true,
+  debug               => hiera('CONFIG_DEBUG_MODE'),
+  database_connection => "mysql://heat:${heat_qpid_cfg_heat_db_pw}@${heat_qpid_cfg_mariadb_host}/heat",
 }
diff --git a/packstack/puppet/templates/heat_rabbitmq.pp b/packstack/puppet/templates/heat_rabbitmq.pp
index e75e3e165..9d383a0ac 100644
--- a/packstack/puppet/templates/heat_rabbitmq.pp
+++ b/packstack/puppet/templates/heat_rabbitmq.pp
@@ -3,15 +3,15 @@ $heat_rabbitmq_cfg_heat_db_pw = hiera('CONFIG_HEAT_DB_PW')
 $heat_rabbitmq_cfg_mariadb_host = hiera('CONFIG_MARIADB_HOST')
 
 class { 'heat':
-  keystone_host     => $heat_rabbitmq_cfg_ctrl_host,
-  keystone_password => hiera('CONFIG_HEAT_KS_PW'),
-  auth_uri          => "http://${heat_rabbitmq_cfg_ctrl_host}:35357/v2.0",
-  keystone_ec2_uri  => "http://${heat_rabbitmq_cfg_ctrl_host}:35357/v2.0",
-  rpc_backend       => 'heat.openstack.common.rpc.impl_kombu',
-  rabbit_host       => hiera('CONFIG_AMQP_HOST'),
-  rabbit_userid     => hiera('CONFIG_AMQP_AUTH_USER'),
-  rabbit_password   => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
-  verbose           => true,
-  debug             => hiera('CONFIG_DEBUG_MODE'),
-  sql_connection    => "mysql://heat:${heat_rabbitmq_cfg_heat_db_pw}@${heat_rabbitmq_cfg_mariadb_host}/heat",
+  keystone_host       => $heat_rabbitmq_cfg_ctrl_host,
+  keystone_password   => hiera('CONFIG_HEAT_KS_PW'),
+  auth_uri            => "http://${heat_rabbitmq_cfg_ctrl_host}:35357/v2.0",
+  keystone_ec2_uri    => "http://${heat_rabbitmq_cfg_ctrl_host}:35357/v2.0",
+  rpc_backend         => 'heat.openstack.common.rpc.impl_kombu',
+  rabbit_host         => hiera('CONFIG_AMQP_HOST'),
+  rabbit_userid       => hiera('CONFIG_AMQP_AUTH_USER'),
+  rabbit_password     => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
+  verbose             => true,
+  debug               => hiera('CONFIG_DEBUG_MODE'),
+  database_connection => "mysql://heat:${heat_rabbitmq_cfg_heat_db_pw}@${heat_rabbitmq_cfg_mariadb_host}/heat",
 }
diff --git a/packstack/puppet/templates/keystone.pp b/packstack/puppet/templates/keystone.pp
index 2047cf14e..bcc47f867 100644
--- a/packstack/puppet/templates/keystone.pp
+++ b/packstack/puppet/templates/keystone.pp
@@ -4,14 +4,13 @@ $keystone_cfg_ks_db_pw = hiera('CONFIG_KEYSTONE_DB_PW')
 $keystone_cfg_mariadb_host = hiera('CONFIG_MARIADB_HOST')
 
 class { 'keystone':
-  admin_token    => hiera('CONFIG_KEYSTONE_ADMIN_TOKEN'),
-  sql_connection => "mysql://keystone_admin:${keystone_cfg_ks_db_pw}@${keystone_cfg_mariadb_host}/keystone",
-  token_format   => hiera('CONFIG_KEYSTONE_TOKEN_FORMAT'),
-  verbose        => true,
-  debug          => hiera('CONFIG_DEBUG_MODE'),
-  mysql_module   => '2.2',
-  service_name   => $keystone_service_name,
-  enable_ssl     => $keystone_use_ssl,
+  admin_token         => hiera('CONFIG_KEYSTONE_ADMIN_TOKEN'),
+  database_connection => "mysql://keystone_admin:${keystone_cfg_ks_db_pw}@${keystone_cfg_mariadb_host}/keystone",
+  token_format        => hiera('CONFIG_KEYSTONE_TOKEN_FORMAT'),
+  verbose             => true,
+  debug               => hiera('CONFIG_DEBUG_MODE'),
+  service_name        => $keystone_service_name,
+  enable_ssl          => $keystone_use_ssl,
 }
 
 if $keystone_service_name == 'httpd' {
diff --git a/packstack/puppet/templates/mariadb_cinder_install.pp b/packstack/puppet/templates/mariadb_cinder_install.pp
index 5dfa4ae94..ae006d4ec 100644
--- a/packstack/puppet/templates/mariadb_cinder_install.pp
+++ b/packstack/puppet/templates/mariadb_cinder_install.pp
@@ -3,5 +3,4 @@ class { 'cinder::db::mysql':
   host          => '%%',
   allowed_hosts => '%%',
   charset       => 'utf8',
-  mysql_module  => '2.2',
 }
diff --git a/packstack/puppet/templates/mariadb_glance_install.pp b/packstack/puppet/templates/mariadb_glance_install.pp
index b2fe2951a..856b6a07a 100644
--- a/packstack/puppet/templates/mariadb_glance_install.pp
+++ b/packstack/puppet/templates/mariadb_glance_install.pp
@@ -3,5 +3,4 @@ class { 'glance::db::mysql':
   host          => '%%',
   allowed_hosts => '%%',
   charset       => 'utf8',
-  mysql_module  => '2.2',
 }
diff --git a/packstack/puppet/templates/mariadb_heat_install.pp b/packstack/puppet/templates/mariadb_heat_install.pp
index ef99a2ae0..9d8e43bfe 100644
--- a/packstack/puppet/templates/mariadb_heat_install.pp
+++ b/packstack/puppet/templates/mariadb_heat_install.pp
@@ -3,5 +3,4 @@ class { 'heat::db::mysql':
   host          => '%%',
   allowed_hosts => '%%',
   charset       => 'utf8',
-  mysql_module  => '2.2',
 }
diff --git a/packstack/puppet/templates/mariadb_install.pp b/packstack/puppet/templates/mariadb_install.pp
index 26dccb790..3ef048896 100644
--- a/packstack/puppet/templates/mariadb_install.pp
+++ b/packstack/puppet/templates/mariadb_install.pp
@@ -21,19 +21,19 @@ class { 'mysql::server':
 # deleting database users for security
 # 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', '@%%' ]:
+mysql_user { [ 'root@127.0.0.1', 'root@::1', '@localhost', '@%%' ]:
   ensure  => 'absent',
   require => Class['mysql::server'],
 }
 
 if ($::fqdn != '' and $::fqdn != 'localhost') {
-  database_user { [ "root@${::fqdn}", "@${::fqdn}"]:
+  mysql_user { [ "root@${::fqdn}", "@${::fqdn}"]:
     ensure  => 'absent',
     require => Class['mysql::server'],
   }
 }
 if ($::fqdn != $::hostname and $::hostname != 'localhost') {
-  database_user { ["root@${::hostname}", "@${::hostname}"]:
+  mysql_user { ["root@${::hostname}", "@${::hostname}"]:
     ensure  => 'absent',
     require => Class['mysql::server'],
   }
diff --git a/packstack/puppet/templates/mariadb_keystone_install.pp b/packstack/puppet/templates/mariadb_keystone_install.pp
index 1534bde63..7cf428965 100644
--- a/packstack/puppet/templates/mariadb_keystone_install.pp
+++ b/packstack/puppet/templates/mariadb_keystone_install.pp
@@ -3,5 +3,4 @@ class { 'keystone::db::mysql':
   password      => hiera('CONFIG_KEYSTONE_DB_PW'),
   allowed_hosts => '%%',
   charset       => 'utf8',
-  mysql_module  => '2.2',
 }
diff --git a/packstack/puppet/templates/mariadb_neutron_install.pp b/packstack/puppet/templates/mariadb_neutron_install.pp
index 6bcad4ef7..b109c3a4b 100644
--- a/packstack/puppet/templates/mariadb_neutron_install.pp
+++ b/packstack/puppet/templates/mariadb_neutron_install.pp
@@ -4,5 +4,4 @@ class { 'neutron::db::mysql':
   allowed_hosts => '%%',
   dbname        => hiera('CONFIG_NEUTRON_L2_DBNAME'),
   charset       => 'utf8',
-  mysql_module  => '2.2',
 }
diff --git a/packstack/puppet/templates/mariadb_nova_install.pp b/packstack/puppet/templates/mariadb_nova_install.pp
index 7f18565ae..ea5d006a3 100644
--- a/packstack/puppet/templates/mariadb_nova_install.pp
+++ b/packstack/puppet/templates/mariadb_nova_install.pp
@@ -3,5 +3,4 @@ class { 'nova::db::mysql':
   host          => '%%',
   allowed_hosts => '%%',
   charset       => 'utf8',
-  mysql_module  => '2.2',
 }
diff --git a/packstack/puppet/templates/neutron_api.pp b/packstack/puppet/templates/neutron_api.pp
index 66d41afd0..39d498cbc 100644
--- a/packstack/puppet/templates/neutron_api.pp
+++ b/packstack/puppet/templates/neutron_api.pp
@@ -1,10 +1,9 @@
 class { 'neutron::server':
-  sql_connection => $neutron_sql_connection,
-  connection     => $neutron_sql_connection,
-  auth_password  => $neutron_user_password,
-  auth_host      => hiera('CONFIG_CONTROLLER_HOST'),
-  enabled        => true,
-  mysql_module   => '2.2',
+  database_connection => $neutron_sql_connection,
+  connection          => $neutron_sql_connection,
+  auth_password       => $neutron_user_password,
+  auth_host           => hiera('CONFIG_CONTROLLER_HOST'),
+  enabled             => true,
 }
 
 exec { 'neutron-db-manage upgrade':