diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-04 22:33:53 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-14 22:59:35 +0100 |
| commit | 2fc4b8890ef1ad456ac1ff421f33e005ae0484be (patch) | |
| tree | a5ad052a2c9ec3a93d84d767d2b2fa7ff01dce85 /mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha | |
| parent | 9eb05da8bc5618e4b95d396fcc932a7c0abb3bd6 (diff) | |
[baremetal] Move VCP iface config to own yml
- move linux.network.interface definitions to their own classes, which
also removes the previous requirement of defining {dhcp,single}_nic
parameters in classes that don't actually use them;
- drop now useless {dhcp,single}_nic parameters;
- expand linux_{dhcp,single}_interface macros, since they cause issues
with reclass dict-merge while attempting to override sub-vars (i.e.
it's not possible to set 'enabled: false' via reclass interpolation);
JIRA: FUEL-310
Change-Id: I29d921f545e761de335a60e242a4523d13b06c78
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha')
5 files changed, 5 insertions, 0 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/control.yml index 740f63288..43bec6bcc 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/control.yml @@ -8,5 +8,6 @@ --- classes: - system.neutron.control.openvswitch.cluster + - cluster.baremetal-mcp-pike-common-ha.openstack_interface_vcp_biport - cluster.baremetal-mcp-pike-common-ha.openstack_control - cluster.baremetal-mcp-pike-ovs-ha.infra diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/database.yml index e7d81e6e3..85f5ebcab 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/database.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/database.yml @@ -7,5 +7,6 @@ ############################################################################## --- classes: + - cluster.baremetal-mcp-pike-common-ha.openstack_interface_vcp_biport - cluster.baremetal-mcp-pike-common-ha.openstack_database - cluster.baremetal-mcp-pike-ovs-ha diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/message_queue.yml index 8ae6c52f6..745fd6fd8 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/message_queue.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/message_queue.yml @@ -7,5 +7,6 @@ ############################################################################## --- classes: + - cluster.baremetal-mcp-pike-common-ha.openstack_interface_vcp_biport - cluster.baremetal-mcp-pike-common-ha.openstack_message_queue - cluster.baremetal-mcp-pike-ovs-ha diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/proxy.yml index 2664a0834..5c91f605f 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/proxy.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/proxy.yml @@ -7,5 +7,6 @@ ############################################################################## --- classes: + - cluster.baremetal-mcp-pike-common-ha.openstack_interface_vcp_triport - cluster.baremetal-mcp-pike-common-ha.openstack_proxy - cluster.baremetal-mcp-pike-ovs-ha.infra diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/telemetry.yml index d0aed272d..c6b111939 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/telemetry.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/telemetry.yml @@ -7,5 +7,6 @@ ############################################################################## --- classes: + - cluster.baremetal-mcp-pike-common-ha.openstack_interface_vcp_biport - cluster.baremetal-mcp-pike-common-ha.openstack_telemetry - cluster.baremetal-mcp-pike-ovs-ha.infra |