Merge "Add support Octavia network interface"

ansible/group_vars/all.yml

@@ -158,9 +158,11 @@ api_interface: "{{ network_interface }}"
 storage_interface: "{{ network_interface }}"
 cluster_interface: "{{ network_interface }}"
 tunnel_interface: "{{ network_interface }}"
+octavia_network_interface: "{{ api_interface }}"
 bifrost_network_interface: "{{ network_interface }}"
 dns_interface: "{{ network_interface }}"
 tunnel_interface_address: "{{ hostvars[inventory_hostname]['ansible_' + tunnel_interface]['ipv4']['address'] }}"
+octavia_network_interface_address: "{{ hostvars[inventory_hostname]['ansible_' + octavia_network_interface]['ipv4']['address'] }}"
 
 # Valid options are [ openvswitch, linuxbridge, vmware_nsxv, vmware_nsxv3, vmware_dvs, opendaylight ]
 neutron_plugin_agent: "openvswitch"

ansible/roles/octavia/templates/octavia.conf.j2

@@ -51,8 +51,8 @@ memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansi
 
 [health_manager]
 bind_port = {{ octavia_health_manager_port }}
-bind_ip = {{ api_interface_address }}
-controller_ip_port_list = {{ api_interface_address }}:{{ octavia_health_manager_port }}
+bind_ip = {{ octavia_network_interface_address }}
+controller_ip_port_list = {{ octavia_network_interface_address }}:{{ octavia_health_manager_port }}
 heartbeat_key =insecure
 
 [controller_worker]

etc/kolla/globals.yml

@@ -92,6 +92,7 @@ kolla_internal_vip_address: "10.10.10.254"
 #cluster_interface: "{{ network_interface }}"
 #tunnel_interface: "{{ network_interface }}"
 #dns_interface: "{{ network_interface }}"
+#octavia_network_interface: "{{ api_interface }}"
 
 # This is the raw interface given to neutron as its external network port. Even
 # though an IP address can exist on this interface, it will be unusable in most

releasenotes/notes/add-octavia-network-interface-4e54077c1ca2a2f4.yaml

@@ -0,0 +1,3 @@
+---
+features:
+  - Add support specific Octavia network interface.