summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-09-28 01:40:47 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-09-28 01:22:47 +0000
commit4a0224d6a15500d560fc2d708b0190d7027f1f37 (patch)
tree9b3d072aa4eca8b3c2f8722107661499fa8a6691
parenta9f57c2149731cad16ce92d7eca8ade12fb9f003 (diff)
MaaS: Fix missing service.maas.cluster.single inc
Upstream change [1] made the inclusion of service.maas.cluster.single mandatory by using some default reclass definitions which we don't override explicitly. [1] https://github.com/salt-formulas/salt-formula-maas/commit/ ce118a238bae4bcf19d2f10bca591a40405f7c3c Change-Id: I5746b6906b341a7257e0cd2b4b0bed8ea25840f4 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 4b2dfa552656def5f56a48229705e79c5c7bcfca)
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml1
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml1
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml1
3 files changed, 3 insertions, 0 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
index cbb1cafaf..0900b6524 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
@@ -2,6 +2,7 @@
classes:
- system.linux.system.repo.saltstack.xenial
- system.maas.region.single
+ - service.maas.cluster.single
- cluster.baremetal-mcp-ocata-odl-ha.infra
parameters:
_param:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml
index 783e4ec00..ee1dfdaf3 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml
@@ -2,6 +2,7 @@
classes:
- system.linux.system.repo.saltstack.xenial
- system.maas.region.single
+ - service.maas.cluster.single
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
parameters:
_param:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
index 2922fa380..bf5783703 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
@@ -2,6 +2,7 @@
classes:
- system.linux.system.repo.saltstack.xenial
- system.maas.region.single
+ - service.maas.cluster.single
- cluster.baremetal-mcp-ocata-ovs-ha.infra
parameters:
_param: