From bcc13c53a58f4e7df800e13a4775432fe3b5395f Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 4 Dec 2017 22:33:53 +0100 Subject: 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 (cherry picked from commit 2fc4b8890ef1ad456ac1ff421f33e005ae0484be) --- .../openstack_interface_vcp_triport.yml | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_interface_vcp_triport.yml (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_interface_vcp_triport.yml') diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_interface_vcp_triport.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_interface_vcp_triport.yml new file mode 100644 index 000000000..cef2a8881 --- /dev/null +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_interface_vcp_triport.yml @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2017 Mirantis Inc., Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +parameters: + _param: + dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} + single_nic: ${_param:opnfv_vcp_vm_secondary_interface} + control_nic: ${_param:opnfv_vcp_vm_tertiary_interface} + linux: + network: + interface: + dhcp_int: + enabled: true + type: eth + proto: dhcp + name: ${_param:dhcp_nic} + route: + mcpcontol: + address: ${_param:opnfv_net_mcpcontrol} + netmask: ${_param:opnfv_net_mcpcontrol_mask} + gateway: ${_param:opnfv_infra_maas_node01_deploy_address} + single_int: + enabled: true + type: eth + proto: static + name: ${_param:single_nic} + address: ${_param:single_address} + netmask: 255.255.255.0 + route: + public: + address: 0.0.0.0 + netmask: 0.0.0.0 + gateway: ${_param:opnfv_net_public_gw} + control_int: + enabled: true + type: eth + proto: static + name: ${_param:control_nic} + address: ${_param:control_address} + netmask: 255.255.255.0 -- cgit 1.2.3-korg