From 2e91cc197b18425540f7eddb207d2f656fb570a4 Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@betacloud-solutions.de>
Date: Thu, 28 Sep 2017 09:32:48 +0200
Subject: [PATCH] Add service plugin segment to neutron

This also sorts the list service_plugins.

Change-Id: I28c12337e56060061a5db13c9a23f8d4b231b1fd
---
 ansible/group_vars/all.yml              |  1 +
 ansible/roles/neutron/defaults/main.yml | 14 ++++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index a7de1e6d59..933c011c3f 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -392,6 +392,7 @@ enable_neutron_qos: "no"
 enable_neutron_agent_ha: "no"
 enable_neutron_bgp_dragent: "no"
 enable_neutron_provider_networks: "no"
+enable_neutron_segments: "no"
 enable_neutron_sfc: "no"
 enable_nova_serialconsole_proxy: "no"
 enable_octavia: "no"
diff --git a/ansible/roles/neutron/defaults/main.yml b/ansible/roles/neutron/defaults/main.yml
index e52d60a692..88858f1e87 100644
--- a/ansible/roles/neutron/defaults/main.yml
+++ b/ansible/roles/neutron/defaults/main.yml
@@ -233,22 +233,24 @@ neutron_extension_drivers: "{{ extension_drivers|selectattr('enabled', 'equalto'
 # Service Plugins
 ####################
 service_plugins:
+  - name: "firewall"
+    enabled: "{{ enable_neutron_fwaas | bool }}"
   - name: "flow_classifier"
     enabled: "{{ enable_neutron_sfc | bool }}"
   - name: "lbaasv2"
     enabled: "{{ enable_neutron_lbaas | bool }}"
-  - name: "firewall"
-    enabled: "{{ enable_neutron_fwaas | bool }}"
-  - name: "vpnaas"
-    enabled: "{{ enable_neutron_vpnaas | bool }}"
+  - name: "neutron_dynamic_routing.services.bgp.bgp_plugin.BgpPlugin"
+    enabled: "{{ enable_neutron_bgp_dragent | bool }}"
   - name: "qos"
     enabled: "{{ enable_neutron_qos | bool or enable_opendaylight_qos | bool}}"
   - name: "router"
     enabled: "{{ not enable_opendaylight_l3 | bool }}"
+  - name: "segments"
+    enabled: "{{ enable_neutron_segments | bool }}"
   - name: "sfc"
     enabled: "{{ enable_neutron_sfc | bool }}"
-  - name: "neutron_dynamic_routing.services.bgp.bgp_plugin.BgpPlugin"
-    enabled: "{{ enable_neutron_bgp_dragent | bool }}"
+  - name: "vpnaas"
+    enabled: "{{ enable_neutron_vpnaas | bool }}"
   - name: "{{ opendaylight_l3_service_plugin }}"
     enabled: "{{ enable_opendaylight_l3 | bool and enable_opendaylight | bool }}"