summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/mcp-odl-noha/openstack
diff options
context:
space:
mode:
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-odl-noha/openstack')
-rw-r--r--mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j27
-rw-r--r--mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml2
2 files changed, 6 insertions, 3 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 d0ee3a3e0..c3e79e524 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
@@ -5,6 +5,7 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
+{%- import 'net_map.j2' as nm with context %}
---
classes:
- service.neutron.compute.single
@@ -33,7 +34,7 @@ parameters:
type: dpdk_ovs_bridge
proto: static
address: ${_param:tenant_address}
- netmask: 255.255.255.0
+ netmask: ${_param:opnfv_net_private_mask}
tenant_interface:
type: dpdk # Not a meaningful type, just match 'dpdk' for filtering
{%- endif %}
@@ -48,7 +49,7 @@ parameters:
type: bridge
proto: static
address: ${_param:tenant_address}
- netmask: 255.255.255.0
+ netmask: ${_param:opnfv_net_private_mask}
use_interfaces:
- ${_param:tenant_interface}
br-floating:
@@ -70,3 +71,5 @@ parameters:
- ${_param:external_interface}
use_ovs_ports:
- float-to-ex
+ gateway: ${_param:opnfv_net_public_gw}
+ name_servers: {{ nm.dns_public }}
diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml
index e554eb6b6..678740f40 100644
--- a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml
@@ -20,6 +20,6 @@ parameters:
mtu: ${_param:interface_mtu}
proto: static
address: ${_param:tenant_address}
- netmask: 255.255.255.0
+ netmask: ${_param:opnfv_net_private_mask}
use_interfaces:
- ${_param:tenant_interface}