Code Review / fuel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 5ad2e31)
MaaS: Fix missing service.maas.cluster.single inc 61/43361/1
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Wed, 27 Sep 2017 23:40:47 +0000 (01:40 +0200)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Wed, 27 Sep 2017 23:59:00 +0000 (01:59 +0200)
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>
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml patch | blob | history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml patch | blob | history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml patch | blob | history

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 cbb1caf..0900b65 100644 (file)
--- 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 783e4ec..ee1dfda 100644 (file)
--- 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 2922fa3..bf57837 100644 (file)
--- 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: