diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-09-25 20:16:23 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-09-26 14:29:49 +0000 |
| commit | 3bfd53969e989e6754c2ae5b3986dd928273dd0c (patch) | |
| tree | 89620d88fe27f9cd3a11464d0092106a04bbb613 /mcp | |
| parent | 5b660398bf5388d24ea8d2bde0f8f1a599739db4 (diff) | |
[reclass] Ensure pxe_admin_address is set for all
Some nodes did not rely on the _param:pxe_admin_address internal
reclass param, although all of them do have an IP address in the
PXE/admin network segment.
Ensure all nodes define this param, so we can query all nodes with:
$ salt '*' pillar.item _param:pxe_admin_address
JIRA: FUEL-394
Change-Id: I7575934752c8b459c52af8a8c98c2b0327756428
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit a20ca2d8aaf550e1a1766768a2f4403a795d9e12)
Diffstat (limited to 'mcp')
| -rw-r--r-- | mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 | 3 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml.j2 | 1 |
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 c26d4a9f6..f028a709b 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 @@ -28,7 +28,8 @@ parameters: maas_admin_password: opnfv_secret maas_db_password: opnfv_secret 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} |