From 4a0224d6a15500d560fc2d708b0190d7027f1f37 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 28 Sep 2017 01:40:47 +0200 Subject: 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 (cherry picked from commit 4b2dfa552656def5f56a48229705e79c5c7bcfca) --- mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml | 1 + .../classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml | 1 + mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml | 1 + 3 files changed, 3 insertions(+) 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: -- cgit 1.2.3-korg