diff options
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-ovs-noha/openstack')
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/compute.yml.j2 (renamed from mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/compute.yml) | 8 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/gateway.yml | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/compute.yml.j2 index beddc4ae8..c949de4f4 100644 --- a/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/mcp-ovs-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 @@ -14,11 +15,16 @@ parameters: linux: network: interface: + pxe_admin_int: + # For scenarios without public network on cmp, set admin gw + gateway: {{ nm.net_admin_gw }} + name_servers: + - {{ nm.net_admin_gw }} br-mesh: enabled: true type: bridge proto: static address: ${_param:tenant_address} - netmask: 255.255.255.0 + netmask: ${_param:opnfv_net_private_mask} use_interfaces: - ${_param:tenant_interface} diff --git a/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/gateway.yml b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/gateway.yml index b5dfcd40d..5c5547cfc 100644 --- a/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/gateway.yml +++ b/mcp/reclass/classes/cluster/mcp-ovs-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} |