From c7e4243cb9ef6111bab4c5421ad7ec09a69e3ce5 Mon Sep 17 00:00:00 2001 From: Guillermo Herrero Date: Mon, 9 Oct 2017 13:56:08 +0200 Subject: Fix parametrized nic name variables -Fix interface order for reclass config node -Interface types regruped on 3 sets for each cpu arch -Foundation VM interface names -VCP VM interface names -Baremetal node interface names Change-Id: I1ae522d775ee538b35b0f043914c80c3993232fc Signed-off-by: Guillermo Herrero (cherry picked from commit c8d0c5b687f5eec9db62171fdf53053f5ffeef28) --- .../classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml | 4 ++-- .../classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml | 4 ++-- .../classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml | 2 +- .../classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra') diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml index 2e3e9d124..33f2804e0 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml @@ -31,8 +31,8 @@ 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:infra_secondary_nic} - single_nic: ${_param:infra_tertiary_nic} + dhcp_nic: ${_param:opnfv_fn_vm_primary_interface} + single_nic: ${_param:opnfv_fn_vm_secondary_interface} linux: network: interface: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml index a84911661..4f8f87a2b 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml @@ -45,8 +45,8 @@ parameters: storage: node: name: default - dhcp_nic: ${_param:infra_primary_nic} - single_nic: ${_param:infra_secondary_nic} + 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-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml index ae2ae4b42..c9b3bc1e0 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml @@ -25,7 +25,7 @@ parameters: cluster_node03_address: ${_param:infra_kvm_node03_address} keepalived_vip_interface: br-ctl keepalived_vip_virtual_router_id: 69 - deploy_nic: ${_param:openstack_primary_nic} + deploy_nic: ${_param:opnfv_baremetal_primary_nic} salt: control: size: # RAM 4096,8192,16384,32768,65536 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml index 40e23eb8c..260da225d 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml @@ -5,9 +5,9 @@ classes: - cluster.baremetal-mcp-ocata-odl-ha.infra parameters: _param: - dhcp_interface: ${_param:infra_primary_nic} - primary_interface: ${_param:infra_secondary_nic} - pxe_interface: ${_param:infra_tertiary_nic} + dhcp_interface: ${_param:opnfv_fn_vm_primary_interface} + primary_interface: ${_param:opnfv_fn_vm_secondary_interface} + pxe_interface: ${_param:opnfv_fn_vm_tertiary_interface} interface_mtu: 1500 # MaaS has issues using MTU > 1500 for PXE interface pxe_interface_mtu: 1500 -- cgit 1.2.3-korg