summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-09-26 14:29:46 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-09-26 14:29:46 +0000
commit7e3b3b75f09dbda98f0d65c1517c2188e7c3e5c5 (patch)
treee73ddb473342af87b89e678889a82886c002b3ca /mcp/reclass/classes
parent9857a8101115487a0e1d460ad8f774b93fef334d (diff)
parenta20ca2d8aaf550e1a1766768a2f4403a795d9e12 (diff)
Merge "[reclass] Ensure pxe_admin_address is set for all"
Diffstat (limited to 'mcp/reclass/classes')
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j23
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml.j21
2 files changed, 3 insertions, 1 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2
index 9d5115844..e16453e03 100644
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2
@@ -26,7 +26,8 @@ parameters:
linux_system_codename: xenial
maas_admin_username: opnfv
dns_server01: '{{ nm.dns_public[0] }}'
- single_address: ${_param:infra_maas_node01_deploy_address}
+ pxe_admin_address: ${_param:infra_maas_node01_deploy_address}
+ single_address: ${_param:pxe_admin_address}
hwe_kernel: 'hwe-16.04'
opnfv_maas_timeout_comissioning: {{ nm.maas_timeout_comissioning }}
opnfv_maas_timeout_deploying: {{ nm.maas_timeout_deploying }}
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml.j2
index a6bf5cda4..314cde78e 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml.j2
@@ -13,6 +13,7 @@ classes:
parameters:
_param:
openstack_control_node01_hostname: ctl01
+ pxe_admin_address: ${_param:reclass_config_master}
single_address: ${_param:opnfv_infra_config_address}
salt_master_host: 127.0.0.1
salt_minion_ca_host: ${linux:network:fqdn}