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)

1 files changed, 0 insertions, 34 deletions

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_proxy.yml
index 031955606..98b3b4c81 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_proxy.yml
@@ -30,41 +30,7 @@ parameters:
       mode: secure
     cluster_vip_address: ${_param:openstack_proxy_address}
     salt_minion_ca_host: cfg01.${_param:cluster_domain}
-    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
     system:
       package:
         libapache2-mod-wsgi: