[baremetal] Move all MaaS PXE net config to PDF

- s/opnfv_maas_pxe_/opnfv_infra_maas_pxe_/g to align with other vars;
- patches: pharos: Add MaaS PXE network to installer adapter;
- runtime.yml{,.template}: move to installer adapter, update
  pod_config.yml example;
- drop MAAS_PXE_NETWORK global env var, now read strictly from PDF;

JIRA: FUEL-313

Change-Id: I46d7510bd53fba7890c411d36bc28fd6ff6f3648
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 15e982f0d00dbcc72be2f5b25dab34b3f3efd912)

7 files changed, 11 insertions, 21 deletions

diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example
index a3a78d608..66999de86 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example
@@ -17,6 +17,11 @@ parameters:
     opnfv_infra_kvm_node02_address: 10.167.4.142
     opnfv_infra_kvm_node03_address: 10.167.4.143
 
+    opnfv_infra_maas_pxe_network_address: 192.168.11.0
+    opnfv_infra_maas_pxe_address: 192.168.11.3
+    opnfv_infra_maas_pxe_start_address: 192.168.11.5
+    opnfv_infra_maas_pxe_end_address: 192.168.11.250
+
     opnfv_openstack_gateway_node01_address: 10.167.4.124
     opnfv_openstack_gateway_node02_address: 10.167.4.125
     opnfv_openstack_gateway_node03_address: 10.167.4.126
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml
index 4fd9e0368..b8b8fb673 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml
@@ -12,9 +12,3 @@ parameters:
     opnfv_maas_mcp_address: 10.20.0.3
     opnfv_net_mcpcontrol: 10.20.0.0
     opnfv_net_mcpcontrol_mask: 255.255.255.0
-
-    # These should be moved to pod_config.yml and read based on PDF admin net
-    opnfv_maas_pxe_network_address: 192.168.11.0
-    opnfv_maas_pxe_address: 192.168.11.3
-    opnfv_maas_pxe_start_address: 192.168.11.5
-    opnfv_maas_pxe_end_address: 192.168.11.250
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template
index 342dc77aa..c00cafd75 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template
@@ -12,9 +12,3 @@ parameters:
     opnfv_maas_mcp_address: ${MAAS_IP}
     opnfv_net_mcpcontrol: ${SALT_MASTER%.*}.0
     opnfv_net_mcpcontrol_mask: 255.255.255.0
-
-    # These should be moved to pod_config.yml and MAAS_PXE_NETWORK dropped
-    opnfv_maas_pxe_network_address: ${MAAS_PXE_NETWORK}
-    opnfv_maas_pxe_address: ${MAAS_PXE_NETWORK%.*}.3
-    opnfv_maas_pxe_start_address: ${MAAS_PXE_NETWORK%.*}.5
-    opnfv_maas_pxe_end_address: ${MAAS_PXE_NETWORK%.*}.250
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml
index 7bea9039a..261dbc4d4 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml
@@ -27,7 +27,7 @@ parameters:
     infra_config_address: ${_param:opnfv_infra_config_address}
     infra_config_deploy_address: ${_param:reclass_config_master}
     infra_maas_node01_address: ${_param:opnfv_infra_maas_node01_address}
-    infra_maas_node01_deploy_address: ${_param:opnfv_maas_pxe_address}
+    infra_maas_node01_deploy_address: ${_param:opnfv_infra_maas_pxe_address}
 
     infra_kvm_address: ${_param:opnfv_infra_kvm_address}
     infra_kvm_node01_address: ${_param:opnfv_infra_kvm_node01_address}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml
index e8c2965f7..93db0ed14 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml
@@ -42,12 +42,12 @@ parameters:
         default_min_hwe_kernel: 'hwe-16.04'
       subnets:
         opnfv_maas_pxe:
-          name: ${_param:opnfv_maas_pxe_network_address}/24
-          cidr: ${_param:opnfv_maas_pxe_network_address}/24
+          name: ${_param:opnfv_infra_maas_pxe_network_address}/24
+          cidr: ${_param:opnfv_infra_maas_pxe_network_address}/24
           gateway_ip: ${_param:single_address}
           iprange:
-            start: ${_param:opnfv_maas_pxe_start_address}
-            end: ${_param:opnfv_maas_pxe_end_address}
+            start: ${_param:opnfv_infra_maas_pxe_start_address}
+            end: ${_param:opnfv_infra_maas_pxe_end_address}
             type: dynamic
           vlans:
             untagged:
diff --git a/mcp/salt-formulas/maas/pxe_route.sls b/mcp/salt-formulas/maas/pxe_route.sls
index 5167c9ad8..d1082cb48 100644
--- a/mcp/salt-formulas/maas/pxe_route.sls
+++ b/mcp/salt-formulas/maas/pxe_route.sls
@@ -10,6 +10,6 @@ routes:
     - name: {{ salt['pillar.get']('_param:opnfv_fn_vm_primary_interface') }}
     - routes:
       - name: maas_mcp_to_pxe_network
-        ipaddr: {{ salt['pillar.get']('_param:opnfv_maas_pxe_network_address') }}
+        ipaddr: {{ salt['pillar.get']('_param:opnfv_infra_maas_pxe_network_address') }}
         netmask: 255.255.255.0
         gateway: {{ salt['pillar.get']('_param:opnfv_maas_mcp_address') }}
diff --git a/mcp/scripts/globals.sh b/mcp/scripts/globals.sh
index 9ef9eba12..fe8d7a3f9 100644
--- a/mcp/scripts/globals.sh
+++ b/mcp/scripts/globals.sh
@@ -14,9 +14,6 @@ export SALT_MASTER=${INSTALLER_IP:-10.20.0.2}
 export SALT_MASTER_USER=${SALT_MASTER_USER:-ubuntu}
 export MAAS_IP=${MAAS_IP:-${SALT_MASTER%.*}.3}
 
-# Define a default network address, baremetal might override it via PDF
-export MAAS_PXE_NETWORK=${MAAS_PXE_NETWORK:-192.168.11.0}
-
 # Derivated from above global vars
 export SSH_OPTS="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ${SSH_KEY}"
 export SSH_SALT="${SALT_MASTER_USER}@${SALT_MASTER}"