diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/compute.yml b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/compute.yml
index e6b7e25..6f4026f 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/compute.yml
@@ -16,3 +16,7 @@
       network:
         engine: k8s
         host: none
+  kubernetes:
+    pool:
+      network:
+        hash: a3af7a06f9382a3f54f219a63631651d
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml
index a6de5e9..7ca0e79 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml
@@ -65,3 +65,14 @@
       identity:
         engine: k8s
         host: none
+  rabbitmq:
+    server:
+      host:
+        '/':
+          enabled: true
+          user: guest
+          password: guest
+          policies:
+          - name: HA
+            pattern: '^(?!amq\.).*'
+            definition: '{"ha-mode": "all", "message-ttl": 120000}'
diff --git a/classes/system b/classes/system
index 5501d8c..48c6b52 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 5501d8ce0a954aeadb774e12752d9e65338c211a
+Subproject commit 48c6b52f3ee5492b19f74cdb34b906e27eefff46