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 --- .../cluster/baremetal-mcp-pike-common-ha/infra/config.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/config.yml') diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/config.yml index 2003aa08e..6cad47dfd 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/config.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/config.yml @@ -41,8 +41,18 @@ parameters: linux: network: interface: - dhcp: ${_param:linux_dhcp_interface} - single: ${_param:linux_single_interface} + dhcp: + enabled: true + type: eth + proto: dhcp + name: ${_param:dhcp_nic} + single: + enabled: true + type: eth + proto: static + name: ${_param:single_nic} + address: ${_param:single_address} + netmask: 255.255.255.0 salt: master: accept_policy: open_mode -- cgit 1.2.3-korg