From 1b03bd3ec9ff4a3897e007dfcd95d49d017ec323 Mon Sep 17 00:00:00 2001 From: Guillermo Herrero Date: Wed, 13 Sep 2017 14:15:07 +0200 Subject: Pod Descriptor File compatible reclass structure Implementation for baremetal-mcp-ocata-ovs-ha scenario JIRA: FUEL-275 Change-Id: Id6ab5697f993ac9faa019c3c10ba4ed4b7b6db01 Signed-off-by: Guillermo Herrero (cherry picked from commit 5c0a09fbd0f377df56bfcfe94b262225a34f98ff) --- .../cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml') diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml index 93a26b19e..a48d924e0 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml @@ -67,19 +67,19 @@ parameters: netmask: 255.255.255.0 mtu: 1500 use_interfaces: - - ${_param:tenant_nic}.302 - vlan300: + - ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan} + mgmt-vlan: enabled: true proto: manual type: vlan - name: ${_param:mgmt_nic}.300 + name: ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan} use_interfaces: - ${_param:mgmt_nic} - vlan302: + tenant-vlan: enabled: true proto: manual type: vlan - name: ${_param:tenant_nic}.302 + name: ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan} use_interfaces: - ${_param:tenant_nic} br-ctl: @@ -89,7 +89,7 @@ parameters: address: ${_param:single_address} netmask: 255.255.255.0 use_interfaces: - - ${_param:mgmt_nic}.300 + - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan} br-floating: enabled: true type: ovs_bridge -- cgit 1.2.3-korg