diff options
author | 2017-10-18 15:07:49 +0000 | |
---|---|---|
committer | 2017-10-18 15:07:49 +0000 | |
commit | 0d7c1243405a58ecf3d0a85fcedecfbce6a626cd (patch) | |
tree | 6891360f6fc168b099f6ca889dcff8eb3e4ea402 /mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra | |
parent | 52e2e55bf55b58a304553fe1529def3709c91ded (diff) | |
parent | 3763a5d236413a5a02b8950b5b77eb9bfa75badb (diff) |
Merge "[baremetal] reclass: Fix class order for common" into stable/euphrates
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra')
4 files changed, 4 insertions, 4 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml index 991e3f9f7..0d2c5a303 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml @@ -8,8 +8,8 @@ --- classes: - system.reclass.storage.system.opendaylight_control_single - - cluster.baremetal-mcp-ocata-odl-ha.infra - cluster.baremetal-mcp-ocata-common.infra.config + - cluster.baremetal-mcp-ocata-odl-ha.infra parameters: reclass: storage: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml index 2017aa4a3..efcf1a4e7 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml @@ -7,8 +7,8 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-odl-ha.openstack - cluster.baremetal-mcp-ocata-common.infra + - cluster.baremetal-mcp-ocata-odl-ha.openstack parameters: _param: cluster_name: baremetal-mcp-ocata-odl-ha diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml index 344b19028..d7bbadd75 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml @@ -7,8 +7,8 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-odl-ha.infra - cluster.baremetal-mcp-ocata-common.infra.kvm + - cluster.baremetal-mcp-ocata-odl-ha.infra parameters: salt: control: 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 17e1e02ac..5b842bba9 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 @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-odl-ha.infra - cluster.baremetal-mcp-ocata-common.infra.maas + - cluster.baremetal-mcp-ocata-odl-ha.infra |