diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
index e9ded9a..0fcc165 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
@@ -8,6 +8,7 @@
 - system.kubernetes.master.cluster
 - system.kubernetes.master.auth.rbac
 - system.kubernetes.control.roles.cluster-admin
+- system.kubernetes.control.roles.genie-pod-patch
 - cluster.k8s-ha-calico-flannel-virtlet.kubernetes.compute
 - cluster.k8s-ha-calico-flannel-virtlet
 parameters:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml
index 37eb9d1..95066cb 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml
@@ -2,8 +2,8 @@
   _param:
     # openstack service addresses
     openstack_database_address: 172.16.10.254
-    openstack_proxy_address: 172.16.10.121
     openstack_proxy_node01_address: 172.16.10.121
+    openstack_proxy_address: ${_param:openstack_proxy_node01_address}
     openstack_control_address: 172.16.10.254
     openstack_control_node01_hostname: ctl01
     openstack_control_node02_hostname: ctl02
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
index 352e7a3..4b904f0 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
@@ -2,8 +2,8 @@
   _param:
     # openstack service addresses
     openstack_database_address: 172.16.10.254
-    openstack_proxy_address: 172.16.10.121
     openstack_proxy_node01_address: 172.16.10.121
+    openstack_proxy_address: ${_param:openstack_proxy_node01_address}
     openstack_control_address: 172.16.10.254
     openstack_control_node01_hostname: ctl01
     openstack_control_node02_hostname: ctl02
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml
index b261b05..7ee55c2 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml
@@ -2,8 +2,8 @@
   _param:
     # openstack service addresses
     openstack_database_address: 172.16.10.254
-    openstack_proxy_address: 172.16.10.121
     openstack_proxy_node01_address: 172.16.10.121
+    openstack_proxy_address: ${_param:openstack_proxy_node01_address}
     openstack_control_address: 172.16.10.254
     openstack_control_node01_hostname: ctl01
     openstack_control_node02_hostname: ctl02
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml
index b813a5d..68fdc35 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml
@@ -2,8 +2,8 @@
   _param:
     # openstack service addresses
     openstack_database_address: 172.16.10.254
-    openstack_proxy_address: 172.16.10.121
     openstack_proxy_node01_address: 172.16.10.121
+    openstack_proxy_address: ${_param:openstack_proxy_node01_address}
     openstack_control_address: 172.16.10.254
     openstack_control_node01_hostname: ctl01
     openstack_control_node02_hostname: ctl02