Merge "Run barbican under apache natively" into stable/queens
diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
index a2a08ef..086346e 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -34,6 +34,7 @@
- service.cinder.volume.single
- system.cinder.volume.backend.lvm
- system.horizon.server.single
+- system.horizon.server.plugin.heat
- system.bind.server.single
- system.designate.server.single
- system.designate.server.backend.bind
diff --git a/classes/system b/classes/system
index 4ea68a3..61f6209 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 4ea68a31a721de6e95d717a49a8f4855d142e436
+Subproject commit 61f6209628abf10d6427daff7f6509cc8deea1dc