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-common-ha/openstack_compute.yml | 3 --- 1 file changed, 3 deletions(-) (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml') diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml index 50241b4f0..5c077d5dd 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml @@ -35,9 +35,6 @@ parameters: loopback_device_size: 20 linux_system_codename: xenial glusterfs_version: '3.13' - # {dhcp,single}_nic are not used, but referenced - dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} - single_nic: ${_param:opnfv_vcp_vm_secondary_interface} glusterfs: client: volumes: -- cgit 1.2.3-korg