From 33a0cd38130e1b8ff466572baa1b8f92ddc5aef3 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 22 Aug 2017 21:01:34 +0200 Subject: p/fuel: Re-parametrize Openstack public net Instead of passing public net via local_env, deduce its range based on compute external IPs. Change-Id: Ib736921c1d0f4002ea33677e7d794fd3e22001ba Signed-off-by: Alexandru Avadanii --- ...s-network-parametrize-openstack-public-net.patch | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 patches/opnfv-fuel/0007-states-network-parametrize-openstack-public-net.patch (limited to 'patches/opnfv-fuel/0007-states-network-parametrize-openstack-public-net.patch') diff --git a/patches/opnfv-fuel/0007-states-network-parametrize-openstack-public-net.patch b/patches/opnfv-fuel/0007-states-network-parametrize-openstack-public-net.patch deleted file mode 100644 index 63abf6c1..00000000 --- a/patches/opnfv-fuel/0007-states-network-parametrize-openstack-public-net.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Alexandru Avadanii -Date: Thu, 17 Aug 2017 18:54:16 +0200 -Subject: [PATCH] states/network: parametrize openstack public net - -Signed-off-by: Alexandru Avadanii ---- - mcp/config/states/networks | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/mcp/config/states/networks b/mcp/config/states/networks -index df4c0bb..88111e5 100755 ---- a/mcp/config/states/networks -+++ b/mcp/config/states/networks -@@ -1,3 +1,6 @@ -+#!/bin/bash -+OPENSTACK_PUBLIC_NET=${OPENSTACK_PUBLIC_NET:-10.0.9.0/24} -+ - salt 'ctl01*' cmd.run ". /root/keystonercv3; openstack compute service list; openstack network agent list; openstack stack list; openstack volume service list" - salt 'ctl01*' 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; openstack subnet create --gateway 10.0.9.254 --no-dhcp --allocation-pool start=10.0.9.130,end=10.0.9.200 --network floating_net --subnet-range 10.0.9.0/24 floating_subnet" -+salt 'ctl01*' cmd.run ". /root/keystonercv3; openstack subnet create --gateway ${OPENSTACK_PUBLIC_NET%.*}.254 --no-dhcp --allocation-pool start=${OPENSTACK_PUBLIC_NET%.*}.130,end=${OPENSTACK_PUBLIC_NET%.*}.200 --network floating_net --subnet-range ${OPENSTACK_PUBLIC_NET} floating_subnet" -- cgit 1.2.3-korg