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

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