ovs and oc aio lab fixes

Change-Id: I07bb37b17e049eb7cccf5900b64d70524ac3ab51
diff --git a/classes/cluster/os_aio_ovs/openstack/control.yml b/classes/cluster/os_aio_ovs/openstack/control.yml
index 38ed2ba..d5ebcaa 100644
--- a/classes/cluster/os_aio_ovs/openstack/control.yml
+++ b/classes/cluster/os_aio_ovs/openstack/control.yml
@@ -21,34 +21,49 @@
 - system.cinder.control.single
 - system.heat.server.single
 #- system.galera.server.cluster
-- system.galera.server.database.ceilometer
-- system.galera.server.database.cinder
-- system.galera.server.database.glance
-- system.galera.server.database.heat
-- system.galera.server.database.keystone
-- system.galera.server.database.nova
+# - system.galera.server.database.ceilometer
+# - system.galera.server.database.cinder
+# - system.galera.server.database.glance
+# - system.galera.server.database.heat
+# - system.galera.server.database.keystone
+# - system.galera.server.database.nova
+
+- system.mysql.client.database.keystone
+- system.mysql.client.database.glance
+- system.mysql.client.database.nova
+- system.mysql.client.database.nova_api
+- system.mysql.client.database.cinder
+- system.mysql.client.database.heat
+
+- service.mysql.server.single
+- system.mysql.client
+- cluster.os_aio_ovs.openstack.dashboard
 - cluster.os_aio_ovs
 parameters:
-  _param:
-    galera_server_cluster_name: galeracluster
-    galera_server_bind_address: ${_param:cluster_local_address}
-    galera_server_bind_port: 3306
-    galera_server_admin_user: root
-  galera:
-    master:
-      enabled: true
-      name: ${_param:galera_server_cluster_name}
-      bind:
-        address: ${_param:galera_server_bind_address}
-        port: ${_param:galera_server_bind_port}
-      maintenance_password: ${_param:galera_server_maintenance_password}
-      admin:
-        user: ${_param:galera_server_admin_user}
-        password: ${_param:galera_server_admin_password}
-      members:
-      - host: ${_param:openstack_control_node01_address}
-        port: 4567
-##################
+#   _param:
+#     galera_server_cluster_name: galeracluster
+#     galera_server_bind_address: ${_param:cluster_local_address}
+#     galera_server_bind_port: 3306
+#     galera_server_admin_user: root
+#   galera:
+#     master:
+#       enabled: true
+#       name: ${_param:galera_server_cluster_name}
+#       bind:
+#         address: ${_param:galera_server_bind_address}
+#         port: ${_param:galera_server_bind_port}
+#       maintenance_password: ${_param:galera_server_maintenance_password}
+#       admin:
+#         user: ${_param:galera_server_admin_user}
+#         password: ${_param:galera_server_admin_password}
+#       members:
+#       - host: ${_param:openstack_control_node01_address}
+#         port: 4567
+# ##################
+  mysql:
+    server:
+      version: '5.6'
+      max_connections: 20000
   linux:
     system:
       package: