From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Sun, 3 Dec 2017 18:44:32 +0000 (+0100)
Subject: baremetal: openstack_proxy: Rename iface dicts
X-Git-Tag: opnfv-6.0.0~235
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=93b36a416f9e5f4e8828ec9544ded29f1bb82098;p=fuel.git

baremetal: openstack_proxy: Rename iface dicts

Later we will want to merge multiple openstack_* classes, which would
try to merge the 'single', 'dhcp' interface definitions and fail due
to mismstached types (proxy has 'dict' types while the rest do not).
Let's rename the proxy iface definitions to prevent that.

JIRA: FUEL-310

Change-Id: I1be18ddbbeae1bb3ee6de9bd783ee57b185cd477
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---

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 84845658c..031955606 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
@@ -36,7 +36,7 @@ parameters:
   linux:
     network:
       interface:
-        dhcp:
+        dhcp_int:
           enabled: true
           type: eth
           proto: dhcp
@@ -46,7 +46,7 @@ parameters:
               address: ${_param:opnfv_net_mcpcontrol}
               netmask: ${_param:opnfv_net_mcpcontrol_mask}
               gateway: ${_param:opnfv_infra_maas_node01_deploy_address}
-        single:
+        single_int:
           enabled: true
           type: eth
           proto: static
@@ -58,7 +58,7 @@ parameters:
               address: 0.0.0.0
               netmask: 0.0.0.0
               gateway: ${_param:opnfv_net_public_gw}
-        control:
+        control_int:
           enabled: true
           type: eth
           proto: static