From 008d45b8defbb5d63fd68dbfb5cacc42d6fa6b8b Mon Sep 17 00:00:00 2001 From: Dai Dang Van Date: Fri, 7 Sep 2018 10:35:15 +0700 Subject: [PATCH] Add support Octavia network interface For now, we use api interface/network for Octavia. This change will make more flexible for Octavia deployment with Kolla when we want to use another network for managing amphora instances (config, health check, clean up) Change-Id: Ief12f1f8b6c7d3974932e6320af95bb58d46bdb9 Co-Authored-By: Duc Nguyen Cong Closes-Bug: #1791207 --- ansible/group_vars/all.yml | 2 ++ ansible/roles/octavia/templates/octavia.conf.j2 | 4 ++-- etc/kolla/globals.yml | 1 + .../notes/add-octavia-network-interface-4e54077c1ca2a2f4.yaml | 3 +++ 4 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/add-octavia-network-interface-4e54077c1ca2a2f4.yaml diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 453c05f776..b81940543c 100644 --- a/ansible/group_vars/all.yml +++ b/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" diff --git a/ansible/roles/octavia/templates/octavia.conf.j2 b/ansible/roles/octavia/templates/octavia.conf.j2 index cb0ea508c8..468417a36a 100644 --- a/ansible/roles/octavia/templates/octavia.conf.j2 +++ b/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] diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index 6b77d4210d..bd41f051a9 100644 --- a/etc/kolla/globals.yml +++ b/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 diff --git a/releasenotes/notes/add-octavia-network-interface-4e54077c1ca2a2f4.yaml b/releasenotes/notes/add-octavia-network-interface-4e54077c1ca2a2f4.yaml new file mode 100644 index 0000000000..17ce7fb5bb --- /dev/null +++ b/releasenotes/notes/add-octavia-network-interface-4e54077c1ca2a2f4.yaml @@ -0,0 +1,3 @@ +--- +features: + - Add support specific Octavia network interface.