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) --- .../cluster/baremetal-mcp-ocata-common-ha/infra/init.yml | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/init.yml') diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/init.yml index a7a04044d..e55f9ce2e 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/init.yml @@ -47,18 +47,6 @@ parameters: storage: node: name: default - linux_dhcp_interface: - enabled: true - type: eth - proto: dhcp - name: ${_param:dhcp_nic} - linux_single_interface: - enabled: true - type: eth - proto: static - name: ${_param:single_nic} - address: ${_param:single_address} - netmask: 255.255.255.0 # yamllint disable-line rule:line-length salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/" -- cgit 1.2.3-korg