From 35041f05e790f8c13782eb4956b991a97fdec853 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 13 Nov 2017 21:12:30 +0100 Subject: [baremetal] Re-assign mgmt network to proxy nodes - extend arch-specific list of predefined VM iface names (2 -> 3); - add extra vnet iface for prx0* VCP VMs, connected to br-ctl (mgmt); - add mgmt address to pod_config.yml template (and sample); - add mgmt address to reclass.storage prx nodes; JIRA: FUEL-302 Change-Id: I17ce65eade7f69219fc27264363364e3c47d8f3f Signed-off-by: Alexandru Avadanii --- mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml | 3 ++- .../cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example | 8 +++++--- mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml | 3 ++- 3 files changed, 9 insertions(+), 5 deletions(-) (limited to 'mcp/reclass/classes/cluster/all-mcp-ocata-common') diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml index c698bba5d..b5b78ec08 100644 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml +++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml @@ -16,7 +16,8 @@ parameters: opnfv_fn_vm_tertiary_interface: enp3s0 opnfv_fn_vm_quaternary_interface: enp4s0 - # VCP VMs spawned on KVM Hosts net ifaces (max 2) + # VCP VMs spawned on KVM Hosts net ifaces (max 3) # NOTE(armband): Only x86 VCP VMs spawned via salt.control names differ opnfv_vcp_vm_primary_interface: ${_param:opnfv_fn_vm_primary_interface} opnfv_vcp_vm_secondary_interface: ${_param:opnfv_fn_vm_secondary_interface} + opnfv_vcp_vm_tertiary_interface: ${_param:opnfv_fn_vm_tertiary_interface} diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example index c85a226c9..d7876282a 100644 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example +++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example @@ -26,9 +26,11 @@ parameters: opnfv_openstack_gateway_node01_tenant_address: 10.1.0.6 opnfv_openstack_gateway_node02_tenant_address: 10.1.0.7 opnfv_openstack_gateway_node03_tenant_address: 10.1.0.9 - opnfv_openstack_proxy_address: 10.167.4.80 - opnfv_openstack_proxy_node01_address: 10.167.4.81 - opnfv_openstack_proxy_node02_address: 10.167.4.82 + opnfv_openstack_proxy_node01_control_address: 10.167.4.81 + opnfv_openstack_proxy_node02_control_address: 10.167.4.82 + opnfv_openstack_proxy_address: 172.30.10.103 + opnfv_openstack_proxy_node01_address: 172.30.10.104 + opnfv_openstack_proxy_node02_address: 172.30.10.105 opnfv_openstack_control_address: 10.167.4.10 opnfv_openstack_control_node01_address: 10.167.4.11 opnfv_openstack_control_node02_address: 10.167.4.12 diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml index 13cbbb981..867ccb782 100644 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml +++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml @@ -16,7 +16,8 @@ parameters: opnfv_fn_vm_tertiary_interface: ens5 opnfv_fn_vm_quaternary_interface: ens6 - # VCP VMs spawned on KVM Hosts net ifaces (max 2) + # VCP VMs spawned on KVM Hosts net ifaces (max 3) # NOTE(armband): Only x86 VCP VMs spawned via salt.control names differ opnfv_vcp_vm_primary_interface: ens2 opnfv_vcp_vm_secondary_interface: ens3 + opnfv_vcp_vm_tertiary_interface: ens4 -- cgit 1.2.3-korg