Enforce static configuration instead of DHCP

- noha: 'accept_policy: open_mode' to align with ha scenarios;
- s/cmp01/cmp001/g to align all scenarios and allow code reuse;
- rename network params: s/dhcp/mcpcontrol/g, cleanup;
- computes XDF data: drop 'opnfv_*' layer of params, cleanup;
- local vPDF: add comments with default roles by node index;
- parameterize all netmasks;
- drop unused address/netmask for 'proto: manual' interfaces;
- virsh_net: cleanup definitions, remove hardcodes, align IP on
  jumpserver and DHCP range with MaaS for pxebr;
- maas: parameterize hardcoded '/24' cidr for PXE/admin, refactor
  maas.region.machines parameterization;
- merge <all-mcp-arch-common/infra/config_*pdf.yaml.j2> templates;
- move reclass.storage definitions of compute nodes to common dir;
- drop 'openstack_compute_*' reclass params in favor of expanding
  them via j2 directly in reclass.storage params;
- adopt `nm.cluster.has_*_nodes` where possible;
- obsolete `runtime.yml` from reclass model;
- refactor arch-specific reclass param selection;
- remove unused defaults in favor of mandatory IDF properties;
- noha: prepare for baremetal node support in cinder_lvm_devices;
- interfaces: add interface_mtu and 'noifupdown: true' everywhere;
- interfaces: use j2 macros to generate eth/vlan config;
- states cleanup: remove DHCP route disable workaround on prx/cmp;
- allow configuring NTP servers via:
  `idf.fuel.network.ntp_strata_host{1,2}`;
- ovs_bridge: Allow setting gateway, dns-nameservers
- apache: Adjust module list for novcp class inheritance;
- glusterfs PPA: pin with same prio of MCP repos for novcp scenario;

JIRA: FUEL-319
JIRA: FUEL-326
JIRA: FUEL-337

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

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}