From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Mon, 18 Dec 2017 15:35:56 +0000 (+0000)
Subject: Merge "[baremetal] Move salt master IP to PXE/admin"
X-Git-Tag: opnfv-6.0.0~196
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a4abff17c7b71408762353bb1ef52d9ffbec2fb7;p=fuel.git

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

a4abff17c7b71408762353bb1ef52d9ffbec2fb7
diff --cc mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
index f5a7ad502,b2e22b3cb..6332776d8
--- 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
@@@ -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'