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

diff --cc mcp/config/states/maas
Simple merge

diff --cc mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
index f5a7ad5,b2e22b3..6332776
--- 1/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
--- 2/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
@@@ -23,10 -23,9 +23,10 @@@ parameters
      maas_db_password: opnfv_secret
      dns_server01: ${_param:opnfv_dns_server01}
      single_address: ${_param:infra_maas_node01_deploy_address}
 +    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 --cc mcp/scripts/lib.sh
Simple merge