diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-29 16:10:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-01-29 16:10:11 +0000 |
| commit | d85061a4672c626fd94900fc63fd79f59beeaf81 (patch) | |
| tree | 6dddcc668065278a9e0b94adb66ce7a754cb1094 /mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha | |
| parent | c5e54b7cd6e45657fdde0e456fdebff23489bb5a (diff) | |
| parent | 738f6c3b68d1179de1ff790f9e72c25f10874da4 (diff) | |
Merge "[FN VMs] remove graphics"
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha')
4 files changed, 11 insertions, 11 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 4d7fa1eb1..27424f6b9 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 @@ -38,9 +38,9 @@ parameters: 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} + dhcp_nic: ${_param:opnfv_vm_primary_interface} + single_nic: ${_param:opnfv_vm_secondary_interface} + pxe_nic: ${_param:opnfv_vm_tertiary_interface} linux: network: interface: 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 da28abf06..3bf87dca4 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 @@ -12,9 +12,9 @@ classes: - cluster.baremetal-mcp-pike-common-ha.infra.lab_proxy_pdf parameters: _param: - dhcp_interface: ${_param:opnfv_fn_vm_primary_interface} - primary_interface: ${_param:opnfv_fn_vm_secondary_interface} - pxe_interface: ${_param:opnfv_fn_vm_tertiary_interface} + dhcp_interface: ${_param:opnfv_vm_primary_interface} + primary_interface: ${_param:opnfv_vm_secondary_interface} + pxe_interface: ${_param:opnfv_vm_tertiary_interface} interface_mtu: 1500 # MaaS has issues using MTU > 1500 for PXE interface pxe_interface_mtu: 1500 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_biport.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_biport.yml index f0fabbafa..9c04ca175 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_biport.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_biport.yml @@ -10,8 +10,8 @@ classes: - cluster.baremetal-mcp-pike-common-ha.include.proxy parameters: _param: - dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} - single_nic: ${_param:opnfv_vcp_vm_secondary_interface} + dhcp_nic: ${_param:opnfv_vm_primary_interface} + single_nic: ${_param:opnfv_vm_secondary_interface} linux: network: interface: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_triport.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_triport.yml index 47f2f76f4..8c07e9156 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_triport.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_triport.yml @@ -10,9 +10,9 @@ classes: - cluster.baremetal-mcp-pike-common-ha.include.proxy parameters: _param: - dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} - single_nic: ${_param:opnfv_vcp_vm_secondary_interface} - control_nic: ${_param:opnfv_vcp_vm_tertiary_interface} + dhcp_nic: ${_param:opnfv_vm_primary_interface} + single_nic: ${_param:opnfv_vm_secondary_interface} + control_nic: ${_param:opnfv_vm_tertiary_interface} linux: network: interface: |