openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Merge "Remove service_group entry from all neutron_services dicts"

Browse Source
This commit is contained in:
Jenkins 2016-07-07 02:10:06 +00:00 committed by Gerrit Code Review
commit 7d65733e5a
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
defaults/main.yml
View File

@ -139,7 +139,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 }}"
@ -149,7 +148,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 }}"
@ -159,7 +157,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 }}"
@ -169,7 +166,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"
@ -178,7 +174,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"
@ -187,7 +182,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 }}"
@ -197,7 +191,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 }}"
@ -207,7 +200,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 }}"
@ -217,7 +209,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 }}"
@ -226,7 +217,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