From 4bed7d3410c1eee461c54d175b0838102f1e9572 Mon Sep 17 00:00:00 2001
From: Vadim Kuznetsov <vakuznet@cisco.com>
Date: Sat, 20 Oct 2018 07:59:21 -0400
Subject: [PATCH] octavia container network address pool

octavia provider network address pool is incorrectly identified
by net_name field of a provider network

.. code-block:: yaml

     - network:
        container_bridge: "br-lbaas"
        container_type: "veth"
        container_interface: "eth14"
        host_bind_override: "eth14"
        ip_from_q: "octavia"
        type: "flat"
        net_name: "octavia"
        group_binds:
          - neutron_linuxbridge_agent
          - octavia-worker
          - octavia-housekeeping
          - octavia-health-manager

In the example ip_from_q and net_name confusingly have the same
value octavia. However ip_from_q refers to cidr_network i.e. address pool
and net_name refers to physical network.

container_network name "octavia_address" comes from ip_from_q value.

Change-Id: Ibbe4636e9b92f2967cbf89a585b8c84a8a56668c
---
 defaults/main.yml            | 3 ++-
 tests/host_vars/octavia1.yml | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 29c287b4..183b1196 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -334,8 +334,9 @@ octavia_management_net_dhcp: "True"
 octavia_service_net_setup: True
 # This sets it to the container managment network based on how you setup
 # the provider net
-octavia_container_network_name: "{{ octavia_provider_network_name }}_address"
 octavia_provider_network: "{{ provider_networks|map(attribute='network')|selectattr('net_name','defined')|selectattr('net_name', 'equalto', octavia_provider_network_name)|list|first }}"
+# The name of the network address pool
+octavia_container_network_name: "{{ octavia_provider_network['ip_from_q'] }}_address"
 octavia_hm_group: "octavia-health-manager"
 # Note: We use some heuritsics here but if you do anyhting special make sure to use the
 # ip addresses on the right network. This will use the container newtorking to figure out the ip
diff --git a/tests/host_vars/octavia1.yml b/tests/host_vars/octavia1.yml
index 6cf6fbfb..3c34af3f 100644
--- a/tests/host_vars/octavia1.yml
+++ b/tests/host_vars/octavia1.yml
@@ -30,3 +30,4 @@ container_networks:
     interface: "eth14"
     netmask: "255.255.255.0"
     type: "veth"
+octavia_container_network_name: "lbaas_address"