summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-18 22:54:55 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-18 22:56:12 +0100
commit569c2cc53dc3a65140978c2bfa89db1500aba1a0 (patch)
tree4a61928c38f2b0847d5696c0cdedc9b335090064 /patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch
parente02b8d4f72f2a84c857b1e8bda380f586e679ad0 (diff)
u/fuel: Bump & rebase for MaaS DHCP fix
Change-Id: Icb3516e6520ea6c1996ffffa744b6cfeb1135f41 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch')
-rw-r--r--patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch14
1 files changed, 7 insertions, 7 deletions
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 d35b63d6..9dce8c5b 100644
--- 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
@@ -41,32 +41,32 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
4 files changed, 8 insertions(+), 8 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 ada2c25..0faf478 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:
+@@ -62,13 +62,13 @@ parameters:
params:
single_address: 172.16.10.105
tenant_address: 10.1.0.105