From 2fc4b8890ef1ad456ac1ff421f33e005ae0484be Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 4 Dec 2017 22:33:53 +0100 Subject: [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 --- .../classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/control.yml | 1 + .../cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/database.yml | 1 + .../cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/message_queue.yml | 1 + .../classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/proxy.yml | 1 + .../cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/telemetry.yml | 1 + 5 files changed, 5 insertions(+) (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack') diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/control.yml index a67546ce9..82db9be87 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/control.yml @@ -8,6 +8,7 @@ --- 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-dpdk-ha.infra parameters: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/database.yml index 369c9ec76..86b4038c2 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/database.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-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-dpdk-ha diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/message_queue.yml index a8b5d38e2..ad9336faa 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/message_queue.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-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-dpdk-ha diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/proxy.yml index 92bdfe0c9..de960d976 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/proxy.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-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-dpdk-ha.infra diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/telemetry.yml index cf71cd962..680efa871 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/telemetry.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-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-dpdk-ha.infra -- cgit 1.2.3-korg