Merge "Add service plugin segment to neutron"

This commit is contained in:
Jenkins 2017-09-28 11:59:21 +00:00 committed by Gerrit Code Review
commit 558953c81b
2 changed files with 9 additions and 6 deletions

View File

@ -392,6 +392,7 @@ enable_neutron_qos: "no"
enable_neutron_agent_ha: "no" enable_neutron_agent_ha: "no"
enable_neutron_bgp_dragent: "no" enable_neutron_bgp_dragent: "no"
enable_neutron_provider_networks: "no" enable_neutron_provider_networks: "no"
enable_neutron_segments: "no"
enable_neutron_sfc: "no" enable_neutron_sfc: "no"
enable_nova_serialconsole_proxy: "no" enable_nova_serialconsole_proxy: "no"
enable_octavia: "no" enable_octavia: "no"

View File

@ -233,22 +233,24 @@ neutron_extension_drivers: "{{ extension_drivers|selectattr('enabled', 'equalto'
# Service Plugins # Service Plugins
#################### ####################
service_plugins: service_plugins:
- name: "firewall"
enabled: "{{ enable_neutron_fwaas | bool }}"
- 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 }}"
- name: "firewall" - name: "neutron_dynamic_routing.services.bgp.bgp_plugin.BgpPlugin"
enabled: "{{ enable_neutron_fwaas | bool }}" enabled: "{{ enable_neutron_bgp_dragent | bool }}"
- name: "vpnaas"
enabled: "{{ enable_neutron_vpnaas | bool }}"
- name: "qos" - name: "qos"
enabled: "{{ enable_neutron_qos | bool or enable_opendaylight_qos | bool}}" enabled: "{{ enable_neutron_qos | bool or enable_opendaylight_qos | bool}}"
- name: "router" - name: "router"
enabled: "{{ not enable_opendaylight_l3 | bool }}" enabled: "{{ not enable_opendaylight_l3 | bool }}"
- name: "segments"
enabled: "{{ enable_neutron_segments | bool }}"
- name: "sfc" - name: "sfc"
enabled: "{{ enable_neutron_sfc | bool }}" enabled: "{{ enable_neutron_sfc | bool }}"
- name: "neutron_dynamic_routing.services.bgp.bgp_plugin.BgpPlugin" - name: "vpnaas"
enabled: "{{ enable_neutron_bgp_dragent | bool }}" enabled: "{{ enable_neutron_vpnaas | bool }}"
- name: "{{ opendaylight_l3_service_plugin }}" - name: "{{ opendaylight_l3_service_plugin }}"
enabled: "{{ enable_opendaylight_l3 | bool and enable_opendaylight | bool }}" enabled: "{{ enable_opendaylight_l3 | bool and enable_opendaylight | bool }}"