aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-18 15:35:56 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-12-18 15:35:56 +0000
commita4abff17c7b71408762353bb1ef52d9ffbec2fb7 (patch)
treecee4340941dac799e7aa01ff3bc642f158846b74 /mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha
parent8494ec245aa24f00f2412d0f9d1e1e32591708d7 (diff)
parentd4ab072aeab143ce72e4b81122d4580915a4ad1a (diff)
Merge "[baremetal] Move salt master IP to PXE/admin"
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha')
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/config.yml9
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml3
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml2
3 files changed, 12 insertions, 2 deletions
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'