diff --git a/classes/cluster/os_aio_ovs/infra/config.yml b/classes/cluster/os_aio_ovs/infra/config.yml
index 2764646..08e7333 100644
--- a/classes/cluster/os_aio_ovs/infra/config.yml
+++ b/classes/cluster/os_aio_ovs/infra/config.yml
@@ -106,11 +106,8 @@
               value_template: <<node_control_ip>>
       node:
         openstack_control_node01:
-          classes:
-          - service.galera.master.cluster
           params:
             mysql_cluster_role: master
-            linux_system_codename: xenial
 
 
   # nginx:
diff --git a/classes/cluster/os_aio_ovs/openstack/init.yml b/classes/cluster/os_aio_ovs/openstack/init.yml
index 6133471..b7f244c 100644
--- a/classes/cluster/os_aio_ovs/openstack/init.yml
+++ b/classes/cluster/os_aio_ovs/openstack/init.yml
@@ -1,12 +1,16 @@
-arameters:
+parameters:
   _param:
-    # openstack_proxy_address: 172.16.10.121
-    # openstack_proxy_node01_address: 172.16.10.121
+    openstack_control_address: ${_param:openstack_control_node01_address}
     openstack_control_node01_address: 172.16.10.101
     openstack_database_address: ${_param:openstack_control_node01_address}
     openstack_message_queue_address: ${_param:openstack_control_node01_address}
     openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
 
+    openstack_gateway_address: ${_param:openstack_gateway_node01_address}
+    openstack_gateway_node01_hostname: gtw01
+    openstack_gateway_node01_address: 172.16.10.110
+
+
     openstack_version: ocata
     apt_mk_version: nightly
     mcp_repo_version: 1.1
@@ -28,7 +32,7 @@
     galera_server_cluster_name: openstack_cluster
     galera_server_maintenance_password: workshop
     galera_server_admin_password: workshop
-#    cluster_vip_address: 172.16.10.254
+    cluster_vip_address: ${_param:openstack_control_node01_address}
     cluster_local_address: ${_param:single_address}
     cluster_node01_hostname: ctl01
     cluster_node01_address: 172.16.10.101
diff --git a/classes/system b/classes/system
index c292a9b..16a320e 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit c292a9b5afb28898fc250f5006b8cbf017bac958
+Subproject commit 16a320eb00a7f557198c4542b644683524c5ae6e