openstack/kolla-ansible
Code Issues Proposed changes

Merge "Use lbproxy instead of lbagent in neutron when deploy Octavia"

Browse Source
This commit is contained in:
Zuul 2018-08-14 06:42:02 +00:00 committed by Gerrit Code Review
commit 0a2ce9a93c
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/roles/neutron/defaults/main.yml
View File

@ -116,7 +116,7 @@ neutron_services:
container_name: "neutron_lbaas_agent" container_name: "neutron_lbaas_agent"
image: "{{ neutron_lbaas_agent_image_full }}" image: "{{ neutron_lbaas_agent_image_full }}"
privileged: True privileged: True
enabled: "{{ enable_neutron_lbaas | bool and neutron_plugin_agent not in ['vmware_nsxv', 'vmware_nsxv3', 'vmware_dvs'] }}" enabled: "{{ enable_neutron_lbaas | bool and not enable_octavia | bool and neutron_plugin_agent not in ['vmware_nsxv', 'vmware_dvs'] }}"
group: "neutron-lbaas-agent" group: "neutron-lbaas-agent"
host_in_groups: "{{ inventory_hostname in groups['neutron-lbaas-agent'] }}" host_in_groups: "{{ inventory_hostname in groups['neutron-lbaas-agent'] }}"
volumes: volumes:
@ -310,7 +310,9 @@ service_plugins:
- name: "flow_classifier" - name: "flow_classifier"
enabled: "{{ enable_neutron_sfc | bool }}" enabled: "{{ enable_neutron_sfc | bool }}"
- name: "lbaasv2" - name: "lbaasv2"
enabled: "{{ enable_neutron_lbaas | bool }}" enabled: "{{ enable_neutron_lbaas | bool and not enable_octavia | bool }}"
- name: "lbaasv2-proxy"
enabled: "{{ enable_neutron_lbaas | bool and enable_octavia | bool }}"
- name: "neutron_dynamic_routing.services.bgp.bgp_plugin.BgpPlugin" - name: "neutron_dynamic_routing.services.bgp.bgp_plugin.BgpPlugin"
enabled: "{{ enable_neutron_bgp_dragent | bool }}" enabled: "{{ enable_neutron_bgp_dragent | bool }}"
- name: "qos" - name: "qos"

2
ansible/roles/neutron/templates/neutron_lbaas.conf.j2
View File

@ -9,7 +9,7 @@ service_provider = LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_d
{% endif %} {% endif %}
[service_auth] [service_auth]
auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3 auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}/v3
admin_tenant_name = service admin_tenant_name = service
admin_user = neutron admin_user = neutron
admin_password = {{ neutron_keystone_password }} admin_password = {{ neutron_keystone_password }}