diff options
Diffstat (limited to 'mcp/reclass/classes/cluster')
6 files changed, 15 insertions, 4 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml index b8b8fb673..387b57f8b 100644 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml +++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml @@ -8,7 +8,7 @@ --- parameters: _param: - reclass_config_master: 10.20.0.2 + opnfv_salt_master_ip: 10.20.0.2 opnfv_maas_mcp_address: 10.20.0.3 opnfv_net_mcpcontrol: 10.20.0.0 opnfv_net_mcpcontrol_mask: 255.255.255.0 diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template index c00cafd75..64f75350c 100644 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template +++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template @@ -8,7 +8,7 @@ --- parameters: _param: - reclass_config_master: ${SALT_MASTER} + opnfv_salt_master_ip: ${SALT_MASTER} opnfv_maas_mcp_address: ${MAAS_IP} opnfv_net_mcpcontrol: ${SALT_MASTER%.*}.0 opnfv_net_mcpcontrol_mask: 255.255.255.0 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/config.yml index 123bcc443..0b1698691 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/config.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-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-ocata-common-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/init.yml index e55f9ce2e..a4f77a72e 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-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-ocata-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/maas.yml index 56cd96b5b..b2e22b3cb 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/maas.yml @@ -25,7 +25,7 @@ parameters: single_address: ${_param:infra_maas_node01_deploy_address} 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' diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/infra/config.yml index 3c3d5260a..ada2c2545 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/infra/config.yml @@ -22,6 +22,7 @@ parameters: _param: openstack_control_node01_hostname: ctl01 reclass_data_repository: local + reclass_config_master: ${_param:opnfv_salt_master_ip} salt_master_environment_repository: "https://github.com/tcpcloud" salt_master_environment_revision: master single_address: 172.16.10.100 |