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  .../classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml     | 6 +++---
  41  mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml  | 6 +++---
  42  mcp/scripts/net_public.xml                                          | 2 +-
  43  6 files changed, 14 insertions(+), 14 deletions(-)
  44
  45 diff --git a/mcp/config/states/networks b/mcp/config/states/networks
  46 index 505153a..bd6e923 100755
  47 --- a/mcp/config/states/networks
  48 +++ b/mcp/config/states/networks
  49 @@ -10,7 +10,7 @@ PUBLIC_NET=$(salt --out yaml 'cmp*' pillar.get _param:external_address | \
  50    pillar.get _param:openstack_compute_node01_external_address | \
  51    awk --re-interval '/[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}/{print $2; exit}')
  52
  53 -[ -n "${PUBLIC_NET}" ] && PUBLIC_NET="${PUBLIC_NET%.*}.0/24" || PUBLIC_NET="10.16.0.0/24"
  54 +[ -n "${PUBLIC_NET}" ] && PUBLIC_NET="${PUBLIC_NET%.*}.0/24" || PUBLIC_NET="10.0.9.0/24"
  55
  56  salt 'ctl01*' cmd.run ". /root/keystonercv3; \
  57    openstack compute service list; \
  58 @@ -21,6 +21,6 @@ salt 'ctl01*' cmd.run ". /root/keystonercv3; \
  59    openstack network create --external --default --provider-network-type flat \
  60      --provider-physical-network physnet1 floating_net"
  61  salt 'ctl01*' cmd.run ". /root/keystonercv3; \
  62 -  openstack subnet create --gateway ${PUBLIC_NET%.*}.1 --no-dhcp \
  63 -    --allocation-pool start=${PUBLIC_NET%.*}.130,end=${PUBLIC_NET%.*}.254 \
  64 +  openstack subnet create --gateway ${PUBLIC_NET%.*}.254 --no-dhcp \
  65 +    --allocation-pool start=${PUBLIC_NET%.*}.130,end=${PUBLIC_NET%.*}.200 \
  66      --network floating_net --subnet-range ${PUBLIC_NET} floating_subnet"
  67 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
  68 index a14a711..055d98c 100644
  69 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml
  70 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml
  71 @@ -6,7 +6,7 @@ parameters:
  72      openstack_region: RegionOne
  73      admin_email: root@localhost
  74      cluster_public_protocol: http
  75 -    cluster_public_host: 10.16.0.101
  76 +    cluster_public_host: 10.0.9.101
  77      neutron_public_protocol: http
  78      neutron_control_dvr: False
  79      neutron_l3_ha: False
  80 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
  81 index 2f8e94a..bc95642 100644
  82 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml
  83 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml
  84 @@ -51,16 +51,16 @@ parameters:
  85            params:
  86              single_address: 172.16.10.105
  87              tenant_address: 10.1.0.105
  88 -            external_address: 10.16.0.105
  89 +            external_address: 10.0.9.105
  90          openstack_compute_node02:
  91            params:
  92              single_address: 172.16.10.106
  93              tenant_address: 10.1.0.106
  94 -            external_address: 10.16.0.106
  95 +            external_address: 10.0.9.106
  96          openstack_gateway_node01:
  97            params:
  98              tenant_address: 10.1.0.110
  99 -            external_address: 10.16.0.110
 100 +            external_address: 10.0.9.110
 101          opendaylight_control_node01:
 102            classes:
 103            - cluster.${_param:cluster_name}.opendaylight.control
 104 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
 105 index aec6cde..b69258f 100644
 106 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
 107 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
 108 @@ -50,17 +50,17 @@ parameters:
 109            params:
 110              single_address: 172.16.10.105
 111              tenant_address: 10.1.0.105
 112 -            external_address: 10.16.0.105
 113 +            external_address: 10.0.9.105
 114              dpdk0_name: enp3s0
 115              dpdk0_pci: '"0000:00:05.0"'
 116          openstack_compute_node02:
 117            params:
 118              single_address: 172.16.10.106
 119              tenant_address: 10.1.0.106
 120 -            external_address: 10.16.0.106
 121 +            external_address: 10.0.9.106
 122              dpdk0_name: enp3s0
 123              dpdk0_pci: '"0000:00:05.0"'
 124          openstack_gateway_node01:
 125            params:
 126              tenant_address: 10.1.0.110
 127 -            external_address: 10.16.0.110
 128 +            external_address: 10.0.9.110
 129 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
 130 index 8cb0992..c8f8477 100644
 131 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
 132 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
 133 @@ -50,13 +50,13 @@ 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          openstack_compute_node02:
 140            params:
 141              single_address: 172.16.10.106
 142              tenant_address: 10.1.0.106
 143 -            external_address: 10.16.0.106
 144 +            external_address: 10.0.9.106
 145          openstack_gateway_node01:
 146            params:
 147              tenant_address: 10.1.0.110
 148 -            external_address: 10.16.0.110
 149 +            external_address: 10.0.9.110
 150 diff --git a/mcp/scripts/net_public.xml b/mcp/scripts/net_public.xml
 151 index 61650d5..f455480 100644
 152 --- a/mcp/scripts/net_public.xml
 153 +++ b/mcp/scripts/net_public.xml
 154 @@ -2,5 +2,5 @@
 155    <name>public</name>
 156    <bridge name="public"/>
 157    <forward mode="nat"/>
 158 -  <ip address="10.16.0.1" netmask="255.255.255.0" />
 159 +  <ip address="10.0.9.254" netmask="255.255.255.0" />
 160  </network>