Code Review / armband.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
u/fuel: Bump & rebase for ODL fix after Pike mv
[armband.git] / patches / opnfv-fuel / 0003-network-public-Use-arm-virtual2-POD-config.patch
diff --git a/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch b/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch
index 9dce8c5..02a079f 100644 (file)
--- a/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch
+++ b/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch
@@ -1,5 +1,5 @@
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Enea AB and others.
+: Copyright (c) 2018 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
@@ -17,7 +17,7 @@ grep -e "10\.16\.0\." -R . -l | \
     -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.
+the universal POD descriptor in pharos, 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
@@ -29,44 +29,41 @@ 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 <Alexandru.Avadanii@enea.com>
 ---
- mcp/config/states/networks                                          | 6 +++---
- .../classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml   | 6 +++---
- .../classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml | 2 +-
- mcp/scripts/net_public.xml                                          | 2 +-
- 4 files changed, 8 insertions(+), 8 deletions(-)
+ mcp/config/states/networks                                        | 8 ++++----
+ .../classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml | 4 ++--
+ .../cluster/virtual-mcp-pike-common-noha/openstack_init.yml       | 2 +-
+ .../classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml    | 2 +-
+ .../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, 11 insertions(+), 11 deletions(-)
 
 diff --git a/mcp/config/states/networks b/mcp/config/states/networks
-index 5beabdb..ca59ee3 100755
+index 222a072..9bbc0ce 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}')
+@@ -17,10 +17,10 @@ POOL_START_IP=$(get_nova_compute_pillar_data 'opnfv_net_public_pool_start')
+ POOL_END_IP=$(get_nova_compute_pillar_data 'opnfv_net_public_pool_end')
 
--[ -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"
+ # Default values
+-PUBLIC_NET="${PUBLIC_NET:-10.16.0.0/24}"
+-PUBLIC_NET_GATEWAY="${PUBLIC_NET_GATEWAY:-10.16.0.1}"
+-POOL_START_IP="${POOL_START_IP:-10.16.0.130}"
+-POOL_END_IP="${POOL_END_IP:-10.16.0.254}"
++PUBLIC_NET="${PUBLIC_NET:-10.0.9.0/24}"
++PUBLIC_NET_GATEWAY="${PUBLIC_NET_GATEWAY:-10.0.9.254}"
++POOL_START_IP="${POOL_START_IP:-10.0.9.130}"
++POOL_END_IP="${POOL_END_IP:-10.0.9.200}"
 
+ # Print openstack status and setup network
  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 ada2c25..0faf478 100644
+index 576925e..8530b10 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
-@@ -62,13 +62,13 @@ parameters:
+@@ -61,9 +61,9 @@ parameters:
            params:
              single_address: 172.16.10.105
              tenant_address: 10.1.0.105
@@ -78,13 +75,8 @@ index ada2c25..0faf478 100644
              tenant_address: 10.1.0.106
 -            external_address: 10.16.0.106
 +            external_address: 10.0.9.106
-         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-common-noha/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml
-index 89b06fb..0086470 100644
+index d5606b5..508d5e1 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:
@@ -96,6 +88,36 @@ index 89b06fb..0086470 100644
      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 abe13ef..ba3a6fc 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