reclass, states: Parametrize runtime configuration

mcpcontrol virsh network, as well as MaaS PXE network are installer
specific, and not POD specific.
Therefore, these should be easily parametrized without the PDF,
using only installer inputs (e.g. env vars passed via Jenkins).

- add new <all-mcp-ocata-common.opnfv.runtime> reclass class;
- parametrize at runtime new reclass class based on global vars;
- factor out MaaS deploy address / config using new mechanism;
- parametrize at runtime virsh network definitions based on template;
- add new "maas.pxe_route" sls for configuring routing on cfg01;
- replace env vars with the new sls in "maas" state;

NOTE: baremetal parametrization will be handled later.

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

2 files changed, 7 insertions, 6 deletions

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
index b6261f624..6bf0fbe63 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
@@ -1,5 +1,6 @@
 classes:
 - system.linux.system.single
+- cluster.all-mcp-ocata-common
 - cluster.baremetal-mcp-ocata-ovs-ha.openstack
 # - cluster.baremetal-mcp-ocata-ovs-ha.stacklight
 # - cluster.baremetal-mcp-ocata-ovs-ha.stacklight.client
@@ -19,7 +20,7 @@ parameters:
     infra_config_address: 10.167.4.100
     infra_config_deploy_address: 10.20.0.2
     infra_maas_node01_address: 10.167.4.3
-    infra_maas_node01_deploy_address: 192.168.11.3
+    infra_maas_node01_deploy_address: ${_param:opnfv_fuel_maas_pxe_address}
     infra_maas_node01_external_address: 10.16.0.3
     infra_compute_node01_address: 10.167.4.141
     infra_compute_node02_address: 10.167.4.142
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
index d193469fc..f77abea6d 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
@@ -32,13 +32,13 @@ parameters:
         network_discovery: 'enabled'
         default_min_hwe_kernel: 'hwe-16.04'
       subnets:
-        # TODO: parametrize address root (192.168.11), dhcp start/end?
-        192.168.11.0/24:
-          cidr: 192.168.11.0/24
+        opnfv_fuel_maas_pxe:
+          name: ${_param:opnfv_fuel_maas_pxe_network}/24
+          cidr: ${_param:opnfv_fuel_maas_pxe_network}/24
           gateway_ip: ${_param:single_address}
           iprange:
-            start: 192.168.11.5
-            end: 192.168.11.250
+            start: ${_param:opnfv_fuel_maas_pxe_iprange_start}
+            end: ${_param:opnfv_fuel_maas_pxe_iprange_end}
             type: dynamic
           vlans:
             untagged: