commit c2fda22858138401f8c4dc2bb1fd9e1a9d9a80b8
author Adam Tengler <atengler@mirantis.com> Thu Jul 27 12:02:48 2017 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> Thu Jul 27 12:02:50 2017 +0000
tree f5e13227a97f8031bdc5737fb7dd7527a885ab74
parent 3ed86f83285e2a5cb8b5a609ca146d54112c16c6
parent a38e0cdd71f36aabc8c96cac215caf537b2e38e7

Merge "Move master of masters address param"

classes/cluster/virtual-mcp11-aio/init.yml

diff --git a/classes/cluster/virtual-mcp11-aio/init.yml b/classes/cluster/virtual-mcp11-aio/init.yml
index c6fca16..af3fdfc 100755
--- a/classes/cluster/virtual-mcp11-aio/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/init.yml
@@ -13,6 +13,7 @@
 - system.memcached.server.single
 - system.rabbitmq.server.single
 - cluster.virtual-mcp11-aio.openstack
+- cluster.overrides
 parameters:
   _param:
     reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab

classes/cluster/virtual-mcp11-ovs-ironic/init.yml

diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/init.yml b/classes/cluster/virtual-mcp11-ovs-ironic/init.yml
index 2f77f4a..23d2566 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/init.yml
@@ -8,7 +8,7 @@
 - system.openssh.server.team.mcp_qa
 - cluster.virtual-mcp11-ovs-ironic.stacklight
 - cluster.virtual-mcp11-ovs-ironic.stacklight.client
-
+- cluster.overrides
 parameters:
   _param:
     cluster_domain: virtual-mcp11-ovs-ironic.local