Code Review / armband.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
u/fuel: Bump & rebase for MaaS proxy support
[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 9b20518..66e4b7d 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
@@ -35,38 +35,41 @@ 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/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 +-
- 4 files changed, 8 insertions(+), 8 deletions(-)
+ 7 files changed, 10 insertions(+), 10 deletions(-)
 
 diff --git a/mcp/config/states/networks b/mcp/config/states/networks
-index d4735ad..e566903 100755
+index 5beabdb..ca59ee3 100755
 --- a/mcp/config/states/networks
 +++ b/mcp/config/states/networks
-@@ -18,7 +18,7 @@ PUBLIC_NET=$(salt --out yaml 'cmp*' pillar.get _param:external_address | \
+@@ -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 'ctl01*' cmd.run ". /root/keystonercv3; \
+ salt -C 'I@nova:controller and *01*' cmd.run ". /root/keystonercv3; \
    openstack compute service list; \
-@@ -29,6 +29,6 @@ salt 'ctl01*' cmd.run ". /root/keystonercv3; \
+@@ -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 'ctl01*' cmd.run ". /root/keystonercv3; \
+ 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 3c3d526..e114ec2 100644
+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,13 +61,13 @@ parameters:
+@@ -61,9 +61,9 @@ parameters:
            params:
              single_address: 172.16.10.105
              tenant_address: 10.1.0.105
@@ -78,13 +81,8 @@ index 3c3d526..e114ec2 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 cf35a2b..d677420 100644
+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:
@@ -96,6 +94,36 @@ index cf35a2b..d677420 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 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