diff --git a/mysql/client/init.yml b/mysql/client/init.yml
new file mode 100644
index 0000000..4cea41a
--- /dev/null
+++ b/mysql/client/init.yml
@@ -0,0 +1,14 @@
+parameters:
+  _param:
+    mysql_client_host: localhost
+  mysql:
+    client:
+      enabled: true
+      server:
+        database:
+          admin:
+            host: ${_param:mysql_client_host}
+            port: 3306
+            user: ${_param:mysql_admin_user}
+            password: ${_param:mysql_admin_password}
+            encoding: utf8
diff --git a/mysql/client/single.yml b/mysql/client/single.yml
index dd96da5..f518a87 100644
--- a/mysql/client/single.yml
+++ b/mysql/client/single.yml
@@ -1,4 +1,5 @@
 classes:
+- system.mysql.client
 - system.mysql.client.database.aodh
 - system.mysql.client.database.ceilometer
 - system.mysql.client.database.cinder
@@ -8,17 +9,3 @@
 - system.mysql.client.database.nova
 - system.mysql.client.database.nova_api
 - system.mysql.client.database.neutron
-parameters:
-  _param:
-    mysql_client_host: localhost
-  mysql:
-    client:
-      enabled: true
-      server:
-        database:
-          admin:
-            host: ${_param:mysql_client_host}
-            port: 3306
-            user: ${_param:mysql_admin_user}
-            password: ${_param:mysql_admin_password}
-            encoding: utf8