Merge "[baremetal] Move salt master IP to PXE/admin"

9 files changed, 18 insertions, 25 deletions

diff --git a/mcp/config/states/maas b/mcp/config/states/maas
index 9ad053805..5e33f3a08 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -64,10 +64,8 @@ fi
 
 # MaaS rack/region controller, node commissioning
 salt -C 'mas01*' state.apply linux,salt,openssh,ntp
-salt -C 'mas01*' state.apply linux.network.interface
 salt -C 'mas01*' state.apply maas.pxe_nat
 salt -C 'mas01*' state.apply maas.cluster
-salt -C 'cfg01*' state.apply maas.pxe_route
 
 wait_for 10 "salt -C 'mas01*' state.apply maas.region"
 
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml
index b8b8fb673..387b57f8b 100644
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml
@@ -8,7 +8,7 @@
 ---
 parameters:
   _param:
-    reclass_config_master: 10.20.0.2
+    opnfv_salt_master_ip: 10.20.0.2
     opnfv_maas_mcp_address: 10.20.0.3
     opnfv_net_mcpcontrol: 10.20.0.0
     opnfv_net_mcpcontrol_mask: 255.255.255.0
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml.template b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml.template
index c00cafd75..64f75350c 100644
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml.template
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml.template
@@ -8,7 +8,7 @@
 ---
 parameters:
   _param:
-    reclass_config_master: ${SALT_MASTER}
+    opnfv_salt_master_ip: ${SALT_MASTER}
     opnfv_maas_mcp_address: ${MAAS_IP}
     opnfv_net_mcpcontrol: ${SALT_MASTER%.*}.0
     opnfv_net_mcpcontrol_mask: 255.255.255.0
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/config.yml
index 6cad47dfd..6b44be6a4 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/config.yml
@@ -33,11 +33,13 @@ parameters:
     salt_master_environment_revision: master
     single_address: ${_param:infra_config_address}
     deploy_address: ${_param:infra_config_deploy_address}
+    pxe_address: ${_param:opnfv_infra_config_pxe_address}
     salt_master_host: ${_param:infra_config_deploy_address}
     # yamllint disable rule:line-length
     salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
     dhcp_nic: ${_param:opnfv_fn_vm_primary_interface}
     single_nic: ${_param:opnfv_fn_vm_secondary_interface}
+    pxe_nic: ${_param:opnfv_fn_vm_tertiary_interface}
   linux:
     network:
       interface:
@@ -53,6 +55,13 @@ parameters:
           name: ${_param:single_nic}
           address: ${_param:single_address}
           netmask: 255.255.255.0
+        pxe:
+          enabled: true
+          type: eth
+          proto: static
+          name: ${_param:pxe_nic}
+          address: ${_param:pxe_address}
+          netmask: 255.255.255.0
   salt:
     master:
       accept_policy: open_mode
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml
index bdb7084c8..731602f12 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml
@@ -19,13 +19,14 @@ parameters:
     cluster_domain: ${_param:cluster_name}.local
     # stacklight_environment: ${_param:cluster_domain}
     reclass_data_revision: master
+    reclass_config_master: ${_param:opnfv_infra_config_pxe_address}
     cluster_public_host: ${_param:openstack_proxy_address}
     infra_config_hostname: cfg01
     infra_maas_database_password: opnfv_secret
 
     # infra service addresses
     infra_config_address: ${_param:opnfv_infra_config_address}
-    infra_config_deploy_address: ${_param:reclass_config_master}
+    infra_config_deploy_address: ${_param:opnfv_salt_master_ip}
     infra_maas_node01_address: ${_param:opnfv_infra_maas_node01_address}
     infra_maas_node01_deploy_address: ${_param:opnfv_infra_maas_node01_deploy_address}
 
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
index f5a7ad502..6332776d8 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
@@ -26,7 +26,7 @@ parameters:
     hwe_kernel: 'hwe-16.04-edge'
   maas:
     region:
-      salt_master_ip: ${_param:infra_config_deploy_address}
+      salt_master_ip: ${_param:reclass_config_master}
       domain: ${_param:cluster_domain}
       maas_config:
         commissioning_distro_series: 'xenial'
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml
index 3c3d5260a..ada2c2545 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml
@@ -22,6 +22,7 @@ parameters:
   _param:
     openstack_control_node01_hostname: ctl01
     reclass_data_repository: local
+    reclass_config_master: ${_param:opnfv_salt_master_ip}
     salt_master_environment_repository: "https://github.com/tcpcloud"
     salt_master_environment_revision: master
     single_address: 172.16.10.100
diff --git a/mcp/salt-formulas/maas/pxe_route.sls b/mcp/salt-formulas/maas/pxe_route.sls
deleted file mode 100644
index d1082cb48..000000000
--- a/mcp/salt-formulas/maas/pxe_route.sls
+++ /dev/null
@@ -1,15 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-routes:
-  network.routes:
-    - name: {{ salt['pillar.get']('_param:opnfv_fn_vm_primary_interface') }}
-    - routes:
-      - name: maas_mcp_to_pxe_network
-        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/lib.sh b/mcp/scripts/lib.sh
index a1f347cb6..982cc37fd 100644
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
@@ -221,8 +221,7 @@ function create_networks {
   # create required networks, including constant "mcpcontrol"
   # FIXME(alav): since we renamed "pxe" to "mcpcontrol", we need to make sure
   # we delete the old "pxe" virtual network, or it would cause IP conflicts.
-  # FIXME(alav): The same applies for "fuel1" virsh network.
-  for net in "fuel1" "pxe" "mcpcontrol" "${vnode_networks[@]}"; do
+  for net in "pxe" "mcpcontrol" "${vnode_networks[@]}"; do
     if virsh net-info "${net}" >/dev/null 2>&1; then
       virsh net-destroy "${net}" || true
       virsh net-undefine "${net}"
@@ -256,8 +255,8 @@ function create_vms {
 
     # prepare network args
     net_args=" --network network=mcpcontrol,model=virtio"
-    if [ "${vnode_data[0]}" = "mas01" ]; then
-      # MaaS node's 3rd interface gets connected to PXE/Admin Bridge
+    if [ "${DEPLOY_TYPE:-}" = 'baremetal' ]; then
+      # 3rd interface gets connected to PXE/Admin Bridge (cfg01, mas01)
       vnode_networks[2]="${vnode_networks[0]}"
     fi
     for net in "${vnode_networks[@]:1}"; do