patches/opnfv-fuel/0010-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                                          | 2 +-
  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, 14 insertions(+), 14 deletions(-)
  38
  39 diff --git a/mcp/config/states/networks b/mcp/config/states/networks
  40 index 205e0a9..df4c0bb 100755
  41 --- a/mcp/config/states/networks
  42 +++ b/mcp/config/states/networks
  43 @@ -1,3 +1,3 @@
  44  salt 'ctl01*' cmd.run ". /root/keystonercv3; openstack compute service list; openstack network agent list; openstack stack list; openstack volume service list"
  45  salt 'ctl01*' cmd.run ". /root/keystonercv3; openstack network create --external --default --provider-network-type flat --provider-physical-network physnet1 floating_net"
  46 -salt 'ctl01*' cmd.run ". /root/keystonercv3; openstack subnet create --gateway 10.16.0.1 --no-dhcp --allocation-pool start=10.16.0.130,end=10.16.0.254 --network floating_net --subnet-range 10.16.0.0/24 floating_subnet"
  47 +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"
  48 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
  49 index 57c6cec..f519e22 100644
  50 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml
  51 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml
  52 @@ -51,16 +51,16 @@ parameters:
  53            params:
  54              single_address: 172.16.10.105
  55              tenant_address: 10.1.0.105
  56 -            external_address: 10.16.0.105
  57 +            external_address: 10.0.9.105
  58          openstack_compute_node02:
  59            params:
  60              single_address: 172.16.10.106
  61              tenant_address: 10.1.0.106
  62 -            external_address: 10.16.0.106
  63 +            external_address: 10.0.9.106
  64          openstack_gateway_node01:
  65            params:
  66              tenant_address: 10.1.0.110
  67 -            external_address: 10.16.0.110
  68 +            external_address: 10.0.9.110
  69          opendaylight_control_node01:
  70            classes:
  71            - cluster.${_param:cluster_name}.opendaylight.control
  72 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
  73 index 66e5a97..98625ff 100644
  74 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml
  75 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml
  76 @@ -6,7 +6,7 @@ parameters:
  77      openstack_region: RegionOne
  78      admin_email: root@localhost
  79      cluster_public_protocol: http
  80 -    cluster_public_host: 10.16.0.101
  81 +    cluster_public_host: 10.0.9.101
  82      neutron_public_protocol: http
  83      neutron_control_dvr: False
  84      neutron_tenant_network_types: "flat,vxlan"
  85 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
  86 index aec6cde..b69258f 100644
  87 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
  88 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
  89 @@ -50,17 +50,17 @@ parameters:
  90            params:
  91              single_address: 172.16.10.105
  92              tenant_address: 10.1.0.105
  93 -            external_address: 10.16.0.105
  94 +            external_address: 10.0.9.105
  95              dpdk0_name: enp3s0
  96              dpdk0_pci: '"0000:00:05.0"'
  97          openstack_compute_node02:
  98            params:
  99              single_address: 172.16.10.106
 100              tenant_address: 10.1.0.106
 101 -            external_address: 10.16.0.106
 102 +            external_address: 10.0.9.106
 103              dpdk0_name: enp3s0
 104              dpdk0_pci: '"0000:00:05.0"'
 105          openstack_gateway_node01:
 106            params:
 107              tenant_address: 10.1.0.110
 108 -            external_address: 10.16.0.110
 109 +            external_address: 10.0.9.110
 110 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
 111 index dfc0b51..b106e86 100644
 112 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml
 113 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml
 114 @@ -6,7 +6,7 @@ parameters:
 115      openstack_region: RegionOne
 116      admin_email: root@localhost
 117      cluster_public_protocol: http
 118 -    cluster_public_host: 10.16.0.101
 119 +    cluster_public_host: 10.0.9.101
 120      neutron_public_protocol: http
 121      neutron_control_dvr: False
 122      neutron_tenant_network_types: "flat,vlan"
 123 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
 124 index 8cb0992..c8f8477 100644
 125 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
 126 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
 127 @@ -50,13 +50,13 @@ parameters:
 128            params:
 129              single_address: 172.16.10.105
 130              tenant_address: 10.1.0.105
 131 -            external_address: 10.16.0.105
 132 +            external_address: 10.0.9.105
 133          openstack_compute_node02:
 134            params:
 135              single_address: 172.16.10.106
 136              tenant_address: 10.1.0.106
 137 -            external_address: 10.16.0.106
 138 +            external_address: 10.0.9.106
 139          openstack_gateway_node01:
 140            params:
 141              tenant_address: 10.1.0.110
 142 -            external_address: 10.16.0.110
 143 +            external_address: 10.0.9.110
 144 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
 145 index 7079fd1..fccde1f 100644
 146 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
 147 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
 148 @@ -6,7 +6,7 @@ parameters:
 149      openstack_region: RegionOne
 150      admin_email: root@localhost
 151      cluster_public_protocol: http
 152 -    cluster_public_host: 10.16.0.101
 153 +    cluster_public_host: 10.0.9.101
 154      neutron_public_protocol: http
 155      neutron_control_dvr: False
 156      neutron_tenant_network_types: "flat,vxlan"
 157 diff --git a/mcp/scripts/net_public.xml b/mcp/scripts/net_public.xml
 158 index 61650d5..f455480 100644
 159 --- a/mcp/scripts/net_public.xml
 160 +++ b/mcp/scripts/net_public.xml
 161 @@ -2,5 +2,5 @@
 162    <name>public</name>
 163    <bridge name="public"/>
 164    <forward mode="nat"/>
 165 -  <ip address="10.16.0.1" netmask="255.255.255.0" />
 166 +  <ip address="10.0.9.254" netmask="255.255.255.0" />
 167  </network>