aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-08-17 12:51:05 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-08-17 12:51:05 +0000
commitce006d7e483ae07279f0c036616d8896f18f7000 (patch)
tree383cd5e25aa8ec21b01aa6e40e79e93ecf77c4a9 /mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2
parentc2902b924da9b2246ec80e7b541950b26ebc8cde (diff)
parent2a1201f80fe5800ffbdf71917eddfeb3a5f6c4c1 (diff)
Merge "[noha] Parameterize network configuration"
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2')
-rw-r--r--mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j212
1 files changed, 7 insertions, 5 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2
index 65792e35e..e9c91ea91 100644
--- a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2
@@ -6,6 +6,8 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
{%- import 'net_map.j2' as nm with context %}
+{%- import 'net_macros.j2' as ma with context %}
+{%- set vlan_private_start = (nm.vlan_private | string).rsplit('-')[0] %}
---
classes:
- service.neutron.compute.single
@@ -35,7 +37,7 @@ parameters:
proto: static
address: ${_param:tenant_address}
netmask: ${_param:opnfv_net_private_mask}
- tenant_interface:
+ {{ nm.cmp001.nic_private }}:
type: dpdk # Not a meaningful type, just match 'dpdk' for filtering
{%- else %}
br-mesh:
@@ -45,11 +47,11 @@ parameters:
address: ${_param:tenant_address}
netmask: ${_param:opnfv_net_private_mask}
use_interfaces:
- - ${_param:tenant_interface}
+ - {{ ma.interface_str(nm.cmp001.nic_private, vlan_private_start) }}
{%- endif %}
- external_interface:
+ ovs_port_{{ nm.cmp001.nic_public }}:
enabled: true
- name: ${_param:external_interface}
+ name: {{ ma.interface_str(nm.cmp001.nic_public, nm.vlan_public) }}
proto: manual
ovs_port_type: OVSPort
type: ovs_port
@@ -63,6 +65,6 @@ parameters:
address: ${_param:external_address}
netmask: ${_param:opnfv_net_public_mask}
use_interfaces:
- - ${_param:external_interface}
+ - {{ ma.interface_str(nm.cmp001.nic_public, nm.vlan_public) }}
gateway: ${_param:opnfv_net_public_gw}
name_servers: {{ nm.dns_public }}