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-31 02:12:00 +0100 |
| commit | bcc13c53a58f4e7df800e13a4775432fe3b5395f (patch) | |
| tree | 7ad2f661c2bb3d634fcc7325ee01e2d6e9147322 /mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack | |
| parent | 154ac4bbb6dd35ed69cb3fce35cf3854a5229202 (diff) | |
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>
(cherry picked from commit 2fc4b8890ef1ad456ac1ff421f33e005ae0484be)
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack')
5 files changed, 5 insertions, 0 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml index 6d120935a..de8c13f1c 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml @@ -8,5 +8,6 @@ --- classes: - system.neutron.control.openvswitch.cluster + - cluster.baremetal-mcp-ocata-common-ha.openstack_interface_vcp_biport - cluster.baremetal-mcp-ocata-common-ha.openstack_control - cluster.baremetal-mcp-ocata-ovs-ha.infra diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml index 91ae84cb3..c55390ecd 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml @@ -7,5 +7,6 @@ ############################################################################## --- classes: + - cluster.baremetal-mcp-ocata-common-ha.openstack_interface_vcp_biport - cluster.baremetal-mcp-ocata-common-ha.openstack_database - cluster.baremetal-mcp-ocata-ovs-ha diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml index 3ce561374..089231ccc 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml @@ -7,5 +7,6 @@ ############################################################################## --- classes: + - cluster.baremetal-mcp-ocata-common-ha.openstack_interface_vcp_biport - cluster.baremetal-mcp-ocata-common-ha.openstack_message_queue - cluster.baremetal-mcp-ocata-ovs-ha diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml index ff6246b75..c2b0240da 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml @@ -7,5 +7,6 @@ ############################################################################## --- classes: + - cluster.baremetal-mcp-ocata-common-ha.openstack_interface_vcp_triport - cluster.baremetal-mcp-ocata-common-ha.openstack_proxy - cluster.baremetal-mcp-ocata-ovs-ha.infra diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml index b8e857d8d..067d63f0e 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml @@ -7,5 +7,6 @@ ############################################################################## --- classes: + - cluster.baremetal-mcp-ocata-common-ha.openstack_interface_vcp_biport - cluster.baremetal-mcp-ocata-common-ha.openstack_telemetry - cluster.baremetal-mcp-ocata-ovs-ha.infra |