diff options
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra')
3 files changed, 6 insertions, 2 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml index 467a45c22..a96e254df 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml @@ -50,8 +50,6 @@ parameters: storage: node: name: default - dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} - single_nic: ${_param:opnfv_vcp_vm_secondary_interface} linux_dhcp_interface: enabled: true type: eth diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml index ce81f4272..3bd705c6c 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml @@ -32,6 +32,9 @@ parameters: keepalived_vip_interface: br-ctl keepalived_vip_virtual_router_id: 69 deploy_nic: ${_param:opnfv_baremetal_primary_nic} + # {dhcp,single}_nic are not used, but referenced + dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} + single_nic: ${_param:opnfv_vcp_vm_secondary_interface} salt: control: size: # RAM 4096,8192,16384,32768,65536 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml index fb5d1cf93..e8c2965f7 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml @@ -23,6 +23,9 @@ parameters: maas_db_password: opnfv_secret dns_server01: ${_param:opnfv_dns_server01} single_address: ${_param:infra_maas_node01_deploy_address} + # {dhcp,single}_nic are not used, but referenced + dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} + single_nic: ${_param:opnfv_vcp_vm_secondary_interface} maas: region: salt_master_ip: ${_param:infra_config_deploy_address} |