From 170809766f3dfb4e3e25a280bb4848b0f68bda8a Mon Sep 17 00:00:00 2001
From: Travis Truman <travis_truman@cable.comcast.com>
Date: Tue, 5 Jul 2016 16:39:39 -0400
Subject: [PATCH] Remove service_group entry from all neutron_services dicts

The `service_group` value is not used within any tasks or templates
in the role, rather the `group` value is used.

Change-Id: I89013567dfae69075e2525bef5e0735c61a821fa
---
 defaults/main.yml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index d9d87ce9..66eb8065 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -142,7 +142,6 @@ neutron_services:
    service_name: neutron-dhcp-agent
    service_en: "{{ neutron_dhcp | bool }}"
    service_conf: dhcp_agent.ini
-   service_group: neutron_agent
    service_rootwrap: rootwrap.d/dhcp.filters
    config_options: --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini
    config_overrides: "{{ neutron_dhcp_agent_ini_overrides }}"
@@ -152,7 +151,6 @@ neutron_services:
    service_name: neutron-openvswitch-agent
    service_en: "{{ neutron_plugin_type == 'ml2.ovs' }}"
    service_conf: plugins/ml2/openvswitch_agent.ini
-   service_group: neutron_openvswitch_agent
    service_rootwrap: rootwrap.d/openvswitch-plugin.filters
    config_options: --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini
    config_overrides: "{{ neutron_openvswitch_agent_ini_overrides }}"
@@ -162,7 +160,6 @@ neutron_services:
    service_name: neutron-linuxbridge-agent
    service_en: "{{ neutron_plugin_type == 'ml2.lxb' }}"
    service_conf: plugins/ml2/linuxbridge_agent.ini
-   service_group: neutron_linuxbridge_agent
    service_rootwrap: rootwrap.d/linuxbridge-plugin.filters
    config_options: --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini --config-file /etc/neutron/plugins/ml2/linuxbridge_agent.ini
    config_overrides: "{{ neutron_linuxbridge_agent_ini_overrides }}"
@@ -172,7 +169,6 @@ neutron_services:
    service_name: neutron-metadata-agent
    service_en: "{{ neutron_metadata | bool }}"
    service_conf: metadata_agent.ini
-   service_group: neutron_agent
    config_options: --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/metadata_agent.ini
    config_overrides: "{{ neutron_metadata_agent_ini_overrides }}"
    config_type: "ini"
@@ -181,7 +177,6 @@ neutron_services:
    service_name: neutron-metering-agent
    service_en: "{{ neutron_metering | bool }}"
    service_conf: metering_agent.ini
-   service_group: neutron_agent
    config_options: --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/metering_agent.ini
    config_overrides: "{{ neutron_metering_agent_ini_overrides }}"
    config_type: "ini"
@@ -190,7 +185,6 @@ neutron_services:
    service_name: neutron-l3-agent
    service_en: "{{ neutron_l3 | bool }}"
    service_conf: l3_agent.ini
-   service_group: neutron_agent
    service_rootwrap: rootwrap.d/l3.filters
    config_options: --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini
    config_overrides: "{{ neutron_l3_agent_ini_overrides }}"
@@ -200,7 +194,6 @@ neutron_services:
    service_name: neutron-lbaas-agent
    service_en: "{{ neutron_lbaas | bool }}"
    service_conf: lbaas_agent.ini
-   service_group: neutron_agent
    service_rootwrap: rootwrap.d/lbaas-haproxy.filters
    config_options: --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/lbaas_agent.ini
    config_overrides: "{{ neutron_lbaas_agent_ini_overrides }}"
@@ -210,7 +203,6 @@ neutron_services:
    service_name: neutron-lbaasv2-agent
    service_en: "{{ neutron_lbaasv2 | bool }}"
    service_conf: lbaas_agent.ini
-   service_group: neutron_agent
    service_rootwrap: rootwrap.d/lbaas-haproxy.filters
    config_options: --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/lbaas_agent.ini
    config_overrides: "{{ neutron_lbaas_agent_ini_overrides }}"
@@ -220,7 +212,6 @@ neutron_services:
    service_name: neutron-vpn-agent
    service_en: "{{ neutron_vpnaas | bool }}"
    service_conf: vpnaas_agent.ini
-   service_group: neutron_agent
    service_rootwrap: rootwrap.d/vpnaas.filters
    config_options: --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/vpnaas_agent.ini
    config_overrides: "{{ neutron_vpnaas_agent_ini_overrides }}"
@@ -229,7 +220,6 @@ neutron_services:
    group: neutron_server
    service_name: neutron-server
    service_en: True
-   service_group: neutron_server
    config_options: "--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/{{ neutron_plugins[neutron_plugin_type].plugin_ini }}"
 
 ## Neutron DHCP Agent