:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: : Copyright (c) 2017 Enea AB and others. : : All rights reserved. This program and the accompanying materials : are made available under the terms of the Apache License, Version 2.0 : which accompanies this distribution, and is available at : http://www.apache.org/licenses/LICENSE-2.0 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: From: Alexandru Avadanii Date: Tue, 18 Jul 2017 19:17:24 +0200 Subject: [PATCH] network: public: Use arm-virtual2 POD config grep -e "10\.16\.0\." -R . -l | \ xargs sed -i \ -e 's/10\.16\.0\./10.0.9./g' \ -e 's/10\.0\.9\.254/10.0.9.200/g' \ -e 's/10\.0\.9\.1/10.0.9.254/g' NOTE: This should be converted into a dynamic configuration read from the universal POD descriptor in securedlab, once that is ready. Until then, just align the public network configuration used by the virtual POD with the Enea lab configuration specific to arm-virtual2 (i.e. public network on 10.0.9.0/24). NOTE: Replace the gateway at 10.16.0.1 (now 10.0.9.1) with the same IP address as our lab's gateway (10.0.9.254), to keep both possible network layouts in sync (using all virtual networks created via virsh, respectively our lab's static config). This will ensure deploys continue to work in both enviroments. Also, since our new gateway resides at 10.0.9.254, trim the DHCP pool range for the public network to not include that address. Signed-off-by: Alexandru Avadanii --- mcp/config/states/networks | 6 +++--- .../classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml | 4 ++-- .../classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml | 2 +- .../classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml | 2 +- .../classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml | 2 +- .../classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml | 2 +- mcp/scripts/net_public.xml | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mcp/config/states/networks b/mcp/config/states/networks index 5beabdb..ca59ee3 100755 --- a/mcp/config/states/networks +++ b/mcp/config/states/networks @@ -18,7 +18,7 @@ PUBLIC_NET=$(salt --out yaml -C 'I@nova:compute and *01*' pillar.get _param:exte pillar.get _param:openstack_compute_node01_external_address | \ awk --re-interval '/[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}/{print $2; exit}') -[ -n "${PUBLIC_NET}" ] && PUBLIC_NET="${PUBLIC_NET%.*}.0/24" || PUBLIC_NET="10.16.0.0/24" +[ -n "${PUBLIC_NET}" ] && PUBLIC_NET="${PUBLIC_NET%.*}.0/24" || PUBLIC_NET="10.0.9.0/24" salt -C 'I@nova:controller and *01*' cmd.run ". /root/keystonercv3; \ openstack compute service list; \ @@ -29,6 +29,6 @@ salt -C 'I@nova:controller and *01*' cmd.run ". /root/keystonercv3; \ openstack network create --external --default --provider-network-type flat \ --provider-physical-network physnet1 floating_net" salt -C 'I@nova:controller and *01*' cmd.run ". /root/keystonercv3; \ - openstack subnet create --gateway ${PUBLIC_NET%.*}.1 --no-dhcp \ - --allocation-pool start=${PUBLIC_NET%.*}.130,end=${PUBLIC_NET%.*}.254 \ + openstack subnet create --gateway ${PUBLIC_NET%.*}.254 --no-dhcp \ + --allocation-pool start=${PUBLIC_NET%.*}.130,end=${PUBLIC_NET%.*}.200 \ --network floating_net --subnet-range ${PUBLIC_NET} floating_subnet" diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml index 7e3a494..3a240b0 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml @@ -61,9 +61,9 @@ parameters: params: single_address: 172.16.10.105 tenant_address: 10.1.0.105 - external_address: 10.16.0.105 + external_address: 10.0.9.105 openstack_compute_node02: params: single_address: 172.16.10.106 tenant_address: 10.1.0.106 - external_address: 10.16.0.106 + external_address: 10.0.9.106 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml index 89b06fb..0086470 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml @@ -14,7 +14,7 @@ parameters: openstack_region: RegionOne admin_email: root@localhost cluster_public_protocol: http - cluster_public_host: 10.16.0.101 + cluster_public_host: 10.0.9.101 neutron_public_protocol: http neutron_control_dvr: 'False' neutron_l3_ha: 'False' diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml index 8e38ff8..d7bf017 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml @@ -24,4 +24,4 @@ parameters: openstack_gateway_node01: params: tenant_address: 10.1.0.110 - external_address: 10.16.0.110 + external_address: 10.0.9.110 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml index e80c442..1df99b4 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml @@ -25,4 +25,4 @@ parameters: openstack_gateway_node01: params: tenant_address: 10.1.0.110 - external_address: 10.16.0.110 + external_address: 10.0.9.110 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml index 66c2468..7326295 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml @@ -17,4 +17,4 @@ parameters: openstack_gateway_node01: params: tenant_address: 10.1.0.110 - external_address: 10.16.0.110 + external_address: 10.0.9.110 diff --git a/mcp/scripts/net_public.xml b/mcp/scripts/net_public.xml index d6df4aa..87f3146 100644 --- a/mcp/scripts/net_public.xml +++ b/mcp/scripts/net_public.xml @@ -10,5 +10,5 @@ public - +