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

   1 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
   2 : Copyright (c) 2018 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 pharos, 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 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  33 ---
  34  mcp/config/states/networks                                        | 8 ++++----
  35  .../classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml | 4 ++--
  36  .../cluster/virtual-mcp-pike-common-noha/openstack_init.yml       | 2 +-
  37  .../classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml    | 2 +-
  38  .../cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml       | 2 +-
  39  .../classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml    | 2 +-
  40  mcp/scripts/net_public.xml                                        | 2 +-
  41  7 files changed, 11 insertions(+), 11 deletions(-)
  42
  43 diff --git a/mcp/config/states/networks b/mcp/config/states/networks
  44 index 222a072..9bbc0ce 100755
  45 --- a/mcp/config/states/networks
  46 +++ b/mcp/config/states/networks
  47 @@ -17,10 +17,10 @@ POOL_START_IP=$(get_nova_compute_pillar_data 'opnfv_net_public_pool_start')
  48  POOL_END_IP=$(get_nova_compute_pillar_data 'opnfv_net_public_pool_end')
  49
  50  # Default values
  51 -PUBLIC_NET="${PUBLIC_NET:-10.16.0.0/24}"
  52 -PUBLIC_NET_GATEWAY="${PUBLIC_NET_GATEWAY:-10.16.0.1}"
  53 -POOL_START_IP="${POOL_START_IP:-10.16.0.130}"
  54 -POOL_END_IP="${POOL_END_IP:-10.16.0.254}"
  55 +PUBLIC_NET="${PUBLIC_NET:-10.0.9.0/24}"
  56 +PUBLIC_NET_GATEWAY="${PUBLIC_NET_GATEWAY:-10.0.9.254}"
  57 +POOL_START_IP="${POOL_START_IP:-10.0.9.130}"
  58 +POOL_END_IP="${POOL_END_IP:-10.0.9.200}"
  59
  60  # Print openstack status and setup network
  61  salt -C 'I@nova:controller and *01*' cmd.run ". /root/keystonercv3; \
  62 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
  63 index 576925e..8530b10 100644
  64 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml
  65 +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml
  66 @@ -61,9 +61,9 @@ parameters:
  67            params:
  68              single_address: 172.16.10.105
  69              tenant_address: 10.1.0.105
  70 -            external_address: 10.16.0.105
  71 +            external_address: 10.0.9.105
  72          openstack_compute_node02:
  73            params:
  74              single_address: 172.16.10.106
  75              tenant_address: 10.1.0.106
  76 -            external_address: 10.16.0.106
  77 +            external_address: 10.0.9.106
  78 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml
  79 index d5606b5..508d5e1 100644
  80 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml
  81 +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml
  82 @@ -14,7 +14,7 @@ parameters:
  83      openstack_region: RegionOne
  84      admin_email: root@localhost
  85      cluster_public_protocol: http
  86 -    cluster_public_host: 10.16.0.101
  87 +    cluster_public_host: 10.0.9.101
  88      neutron_public_protocol: http
  89      neutron_control_dvr: 'False'
  90      neutron_l3_ha: 'False'
  91 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml
  92 index 8e38ff8..d7bf017 100644
  93 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml
  94 +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml
  95 @@ -24,4 +24,4 @@ parameters:
  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 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml
 102 index abe13ef..ba3a6fc 100644
 103 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml
 104 +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml
 105 @@ -25,4 +25,4 @@ parameters:
 106          openstack_gateway_node01:
 107            params:
 108              tenant_address: 10.1.0.110
 109 -            external_address: 10.16.0.110
 110 +            external_address: 10.0.9.110
 111 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml
 112 index 66c2468..7326295 100644
 113 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml
 114 +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml
 115 @@ -17,4 +17,4 @@ parameters:
 116          openstack_gateway_node01:
 117            params:
 118              tenant_address: 10.1.0.110
 119 -            external_address: 10.16.0.110
 120 +            external_address: 10.0.9.110
 121 diff --git a/mcp/scripts/net_public.xml b/mcp/scripts/net_public.xml
 122 index d6df4aa..87f3146 100644
 123 --- a/mcp/scripts/net_public.xml
 124 +++ b/mcp/scripts/net_public.xml
 125 @@ -10,5 +10,5 @@
 126    <name>public</name>
 127    <bridge name="public"/>
 128    <forward mode="nat"/>
 129 -  <ip address="10.16.0.1" netmask="255.255.255.0" />
 130 +  <ip address="10.0.9.254" netmask="255.255.255.0" />
 131  </network>