patches/opnfv-fuel/0005-network-public-Use-arm-virtual2-POD-config.patch

   1 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
   2 Date: Tue, 18 Jul 2017 19:17:24 +0200
   3 Subject: [PATCH] network: public: Use arm-virtual2 POD config
   4
   5 grep -e "10\.16\.0\." -R . -l | \
   6   xargs sed -i \
   7     -e 's/10\.16\.0\./10.0.9./g' \
   8     -e 's/10\.0\.9\.254/10.0.9.200/g' \
   9     -e 's/10\.0\.9\.1/10.0.9.254/g'
  10
  11 NOTE: This should be converted into a dynamic configuration read from
  12 the universal POD descriptor in securedlab, once that is ready.
  13
  14 Until then, just align the public network configuration used by the
  15 virtual POD with the Enea lab configuration specific to arm-virtual2
  16 (i.e. public network on 10.0.9.0/24).
  17
  18 NOTE: Replace the gateway at 10.16.0.1 (now 10.0.9.1) with the same
  19 IP address as our lab's gateway (10.0.9.254), to keep both possible
  20 network layouts in sync (using all virtual networks created via
  21 virsh, respectively our lab's static config).
  22 This will ensure deploys continue to work in both enviroments.
  23
  24 Also, since our new gateway resides at 10.0.9.254, trim the DHCP pool
  25 range for the public network to not include that address.
  26
  27 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  28 ---
  29  mcp/config/states/networks                                          | 6 +++---
  30  mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml  | 6 +++---
  31  .../classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml        | 2 +-
  32  .../classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml     | 6 +++---
  33  .../classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml   | 2 +-
  34  mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml  | 6 +++---
  35  .../classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml        | 2 +-
  36  mcp/scripts/net_public.xml                                          | 2 +-
  37  8 files changed, 16 insertions(+), 16 deletions(-)
  38
  39 diff --git a/mcp/config/states/networks b/mcp/config/states/networks
  40 index 505153a..bd6e923 100755
  41 --- a/mcp/config/states/networks
  42 +++ b/mcp/config/states/networks
  43 @@ -10,7 +10,7 @@ PUBLIC_NET=$(salt --out yaml 'cmp*' pillar.get _param:external_address | \
  44    pillar.get _param:openstack_compute_node01_external_address | \
  45    awk --re-interval '/[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}/{print $2; exit}')
  46
  47 -[ -n "${PUBLIC_NET}" ] && PUBLIC_NET="${PUBLIC_NET%.*}.0/24" || PUBLIC_NET="10.16.0.0/24"
  48 +[ -n "${PUBLIC_NET}" ] && PUBLIC_NET="${PUBLIC_NET%.*}.0/24" || PUBLIC_NET="10.0.9.0/24"
  49
  50  salt 'ctl01*' cmd.run ". /root/keystonercv3; \
  51    openstack compute service list; \
  52 @@ -21,6 +21,6 @@ salt 'ctl01*' cmd.run ". /root/keystonercv3; \
  53    openstack network create --external --default --provider-network-type flat \
  54      --provider-physical-network physnet1 floating_net"
  55  salt 'ctl01*' cmd.run ". /root/keystonercv3; \
  56 -  openstack subnet create --gateway ${PUBLIC_NET%.*}.1 --no-dhcp \
  57 -    --allocation-pool start=${PUBLIC_NET%.*}.130,end=${PUBLIC_NET%.*}.254 \
  58 +  openstack subnet create --gateway ${PUBLIC_NET%.*}.254 --no-dhcp \
  59 +    --allocation-pool start=${PUBLIC_NET%.*}.130,end=${PUBLIC_NET%.*}.200 \
  60      --network floating_net --subnet-range ${PUBLIC_NET} floating_subnet"
  61 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml
  62 index 57c6cec..f519e22 100644
  63 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml
  64 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml
  65 @@ -51,16 +51,16 @@ parameters:
  66            params:
  67              single_address: 172.16.10.105
  68              tenant_address: 10.1.0.105
  69 -            external_address: 10.16.0.105
  70 +            external_address: 10.0.9.105
  71          openstack_compute_node02:
  72            params:
  73              single_address: 172.16.10.106
  74              tenant_address: 10.1.0.106
  75 -            external_address: 10.16.0.106
  76 +            external_address: 10.0.9.106
  77          openstack_gateway_node01:
  78            params:
  79              tenant_address: 10.1.0.110
  80 -            external_address: 10.16.0.110
  81 +            external_address: 10.0.9.110
  82          opendaylight_control_node01:
  83            classes:
  84            - cluster.${_param:cluster_name}.opendaylight.control
  85 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml
  86 index 66e5a97..98625ff 100644
  87 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml
  88 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml
  89 @@ -6,7 +6,7 @@ parameters:
  90      openstack_region: RegionOne
  91      admin_email: root@localhost
  92      cluster_public_protocol: http
  93 -    cluster_public_host: 10.16.0.101
  94 +    cluster_public_host: 10.0.9.101
  95      neutron_public_protocol: http
  96      neutron_control_dvr: False
  97      neutron_tenant_network_types: "flat,vxlan"
  98 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
  99 index aec6cde..b69258f 100644
 100 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
 101 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
 102 @@ -50,17 +50,17 @@ parameters:
 103            params:
 104              single_address: 172.16.10.105
 105              tenant_address: 10.1.0.105
 106 -            external_address: 10.16.0.105
 107 +            external_address: 10.0.9.105
 108              dpdk0_name: enp3s0
 109              dpdk0_pci: '"0000:00:05.0"'
 110          openstack_compute_node02:
 111            params:
 112              single_address: 172.16.10.106
 113              tenant_address: 10.1.0.106
 114 -            external_address: 10.16.0.106
 115 +            external_address: 10.0.9.106
 116              dpdk0_name: enp3s0
 117              dpdk0_pci: '"0000:00:05.0"'
 118          openstack_gateway_node01:
 119            params:
 120              tenant_address: 10.1.0.110
 121 -            external_address: 10.16.0.110
 122 +            external_address: 10.0.9.110
 123 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml
 124 index dfc0b51..b106e86 100644
 125 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml
 126 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml
 127 @@ -6,7 +6,7 @@ parameters:
 128      openstack_region: RegionOne
 129      admin_email: root@localhost
 130      cluster_public_protocol: http
 131 -    cluster_public_host: 10.16.0.101
 132 +    cluster_public_host: 10.0.9.101
 133      neutron_public_protocol: http
 134      neutron_control_dvr: False
 135      neutron_tenant_network_types: "flat,vlan"
 136 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
 137 index 8cb0992..c8f8477 100644
 138 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
 139 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
 140 @@ -50,13 +50,13 @@ parameters:
 141            params:
 142              single_address: 172.16.10.105
 143              tenant_address: 10.1.0.105
 144 -            external_address: 10.16.0.105
 145 +            external_address: 10.0.9.105
 146          openstack_compute_node02:
 147            params:
 148              single_address: 172.16.10.106
 149              tenant_address: 10.1.0.106
 150 -            external_address: 10.16.0.106
 151 +            external_address: 10.0.9.106
 152          openstack_gateway_node01:
 153            params:
 154              tenant_address: 10.1.0.110
 155 -            external_address: 10.16.0.110
 156 +            external_address: 10.0.9.110
 157 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
 158 index 7079fd1..fccde1f 100644
 159 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
 160 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
 161 @@ -6,7 +6,7 @@ parameters:
 162      openstack_region: RegionOne
 163      admin_email: root@localhost
 164      cluster_public_protocol: http
 165 -    cluster_public_host: 10.16.0.101
 166 +    cluster_public_host: 10.0.9.101
 167      neutron_public_protocol: http
 168      neutron_control_dvr: False
 169      neutron_tenant_network_types: "flat,vxlan"
 170 diff --git a/mcp/scripts/net_public.xml b/mcp/scripts/net_public.xml
 171 index 61650d5..f455480 100644
 172 --- a/mcp/scripts/net_public.xml
 173 +++ b/mcp/scripts/net_public.xml
 174 @@ -2,5 +2,5 @@
 175    <name>public</name>
 176    <bridge name="public"/>
 177    <forward mode="nat"/>
 178 -  <ip address="10.16.0.1" netmask="255.255.255.0" />
 179 +  <ip address="10.0.9.254" netmask="255.255.255.0" />
 180  </network>