diff options
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra')
3 files changed, 20 insertions, 9 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 1725894fc..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,15 +19,16 @@ 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_pxe_address} + infra_maas_node01_deploy_address: ${_param:opnfv_infra_maas_node01_deploy_address} infra_kvm_address: ${_param:opnfv_infra_kvm_address} infra_kvm_node01_address: ${_param:opnfv_infra_kvm_node01_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 56cd96b5b..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 @@ -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' @@ -36,7 +37,7 @@ parameters: dnssec_validation: 'no' enable_third_party_drivers: true network_discovery: 'enabled' - default_min_hwe_kernel: 'hwe-16.04' + default_min_hwe_kernel: ${_param:hwe_kernel} subnets: opnfv_maas_pxe: name: ${_param:opnfv_infra_maas_pxe_network_address}/24 @@ -62,7 +63,7 @@ parameters: power_user: ${_param:opnfv_maas_node01_power_user} architecture: ${_param:opnfv_maas_node01_architecture} distro_series: xenial - hwe_kernel: hwe-16.04 + hwe_kernel: ${_param:hwe_kernel} kvm02: interface: mac: ${_param:opnfv_maas_node02_interface_mac} @@ -73,7 +74,7 @@ parameters: power_user: ${_param:opnfv_maas_node02_power_user} architecture: ${_param:opnfv_maas_node02_architecture} distro_series: xenial - hwe_kernel: hwe-16.04 + hwe_kernel: ${_param:hwe_kernel} kvm03: interface: mac: ${_param:opnfv_maas_node03_interface_mac} @@ -84,7 +85,7 @@ parameters: power_user: ${_param:opnfv_maas_node03_power_user} architecture: ${_param:opnfv_maas_node03_architecture} distro_series: xenial - hwe_kernel: hwe-16.04 + hwe_kernel: ${_param:hwe_kernel} cmp001: interface: mac: ${_param:opnfv_maas_node04_interface_mac} @@ -95,7 +96,7 @@ parameters: power_user: ${_param:opnfv_maas_node04_power_user} architecture: ${_param:opnfv_maas_node04_architecture} distro_series: xenial - hwe_kernel: hwe-16.04 + hwe_kernel: ${_param:hwe_kernel} cmp002: interface: mac: ${_param:opnfv_maas_node05_interface_mac} @@ -106,7 +107,7 @@ parameters: power_user: ${_param:opnfv_maas_node05_power_user} architecture: ${_param:opnfv_maas_node05_architecture} distro_series: xenial - hwe_kernel: hwe-16.04 + hwe_kernel: ${_param:hwe_kernel} linux: network: interface: |