From 32891e596b1fb3d5734c85a4e34161617338f38d Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Tue, 28 Mar 2017 22:19:50 -0500 Subject: [PATCH] Ensure the components are isolated from the system This creates a specific slice which all OpenStack services will operate from. By creating an independent slice these components will be governed away from the system slice allowing us to better optimise resource consumption. See the following for more information on slices: * https://www.freedesktop.org/software/systemd/man/systemd.slice.html See for following for more information on resource controls: * https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html Tools like ``systemd-cgtop`` and ``systemd-cgls`` will now give us insight into specific processes, process groups, and resouce consumption in ways that we've not had access to before. To enable some of this reporting the accounting options have been added to the [Service] section of the unit file. Change-Id: I6078d6cf19da27afc22b5f699165acea0139ddc1 Signed-off-by: Kevin Carter --- defaults/main.yml | 41 +++++ handlers/main.yml | 5 + ...nit-config-overrides-ffce7e419061c4da.yaml | 10 ++ tasks/calico_init.yml | 38 ----- tasks/dragonflow.yml | 42 ----- tasks/main.yml | 16 +- tasks/neutron_init.yml | 148 ------------------ tasks/neutron_init_common.yml | 50 ++---- tasks/neutron_init_systemd.yml | 68 ++++++++ templates/neutron-systemd-init.j2 | 19 ++- templates/neutron-systemd-tmpfiles.j2 | 6 +- 11 files changed, 158 insertions(+), 285 deletions(-) create mode 100644 releasenotes/notes/neutron-init-config-overrides-ffce7e419061c4da.yaml delete mode 100644 tasks/calico_init.yml delete mode 100644 tasks/neutron_init.yml create mode 100644 tasks/neutron_init_systemd.yml diff --git a/defaults/main.yml b/defaults/main.yml index 204c32dd..3d53d700 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -216,6 +216,23 @@ neutron_plugins: plugin_ini: plugins/ml2/sriov_nic_agent.ini plugin_conf_ini_overrides: "{{ neutron_sriov_nic_agent_ini_overrides }}" +neutron_dhcp_agent_init_overrides: {} +neutron_openvswitch_agent_init_overrides: {} +neutron_linuxbridge_agent_init_overrides: {} +neutron_metadata_agent_init_overrides: {} +neutron_metering_agent_init_overrides: {} +neutron_l3_agent_init_overrides: {} +neutron_lbaas_agent_init_overrides: {} +neutron_bgp_dragent_init_overrides: {} +neutron_vpn_agent_init_overrides: {} +neutron_server_init_overrides: {} +neutron_calico_felix_init_overrides: {} +neutron_calico_dhcp_agent_init_overrides: {} +neutron_sriov_nic_agent_init_overrides: {} +neutron_dragonflow_controller_agent_init_overrides: {} +neutron_dragonflow_l3_agent_init_overrides: {} +neutron_dragonflow_pubsub_agent_init_overrides: {} + neutron_services: neutron-dhcp-agent: group: neutron_dhcp_agent @@ -227,6 +244,7 @@ neutron_services: config_options: "--config-file {{ neutron_conf_dir }}/neutron.conf --config-file {{ neutron_conf_dir }}/dhcp_agent.ini --log-file=/var/log/neutron/neutron-dhcp-agent.log" config_overrides: "{{ neutron_dhcp_agent_ini_overrides }}" config_type: "ini" + init_config_overrides: "{{ neutron_dhcp_agent_init_overrides }}" neutron-openvswitch-agent: group: neutron_openvswitch_agent service_name: neutron-openvswitch-agent @@ -237,6 +255,7 @@ neutron_services: config_options: "--config-file {{ neutron_conf_dir }}/neutron.conf --config-file {{ neutron_conf_dir }}/plugins/ml2/ml2_conf.ini --config-file {{ neutron_conf_dir }}/plugins/ml2/openvswitch_agent.ini --log-file=/var/log/neutron/neutron-openvswitch-agent.log" config_overrides: "{{ neutron_openvswitch_agent_ini_overrides }}" config_type: "ini" + init_config_overrides: "{{ neutron_openvswitch_agent_init_overrides }}" neutron-linuxbridge-agent: group: neutron_linuxbridge_agent service_name: neutron-linuxbridge-agent @@ -247,6 +266,7 @@ neutron_services: config_options: "--config-file {{ neutron_conf_dir }}/neutron.conf --config-file {{ neutron_conf_dir }}/plugins/ml2/ml2_conf.ini --config-file {{ neutron_conf_dir }}/plugins/ml2/linuxbridge_agent.ini --log-file=/var/log/neutron/neutron-linuxbridge-agent.log" config_overrides: "{{ neutron_linuxbridge_agent_ini_overrides }}" config_type: "ini" + init_config_overrides: "{{ neutron_linuxbridge_agent_init_overrides }}" neutron-metadata-agent: group: neutron_metadata_agent service_name: neutron-metadata-agent @@ -256,6 +276,7 @@ neutron_services: config_options: "--config-file {{ neutron_conf_dir }}/neutron.conf --config-file {{ neutron_conf_dir }}/metadata_agent.ini --log-file=/var/log/neutron/neutron-metadata-agent.log" config_overrides: "{{ neutron_metadata_agent_ini_overrides }}" config_type: "ini" + init_config_overrides: "{{ neutron_metadata_agent_init_overrides }}" neutron-metering-agent: group: neutron_metering_agent service_name: neutron-metering-agent @@ -265,6 +286,7 @@ neutron_services: config_options: "--config-file {{ neutron_conf_dir }}/neutron.conf --config-file {{ neutron_conf_dir }}/metering_agent.ini --log-file=/var/log/neutron/neutron-metering-agent.log" config_overrides: "{{ neutron_metering_agent_ini_overrides }}" config_type: "ini" + init_config_overrides: "{{ neutron_metering_agent_init_overrides }}" # Other agents will use neutron_plugins[neutron_plugin_type].driver_interface # for the interface_driver, but that uses a stevedore alias. Metering agent # hasn't been updated to use stevedore alises so that fails. To work around @@ -283,6 +305,7 @@ neutron_services: config_options: "--config-file {{ neutron_conf_dir }}/neutron.conf --config-file {{ neutron_conf_dir }}/l3_agent.ini --log-file=/var/log/neutron/neutron-l3-agent.log" config_overrides: "{{ neutron_l3_agent_ini_overrides }}" config_type: "ini" + init_config_overrides: "{{ neutron_l3_agent_init_overrides }}" neutron-lbaasv2-agent: group: neutron_lbaas_agent service_name: neutron-lbaasv2-agent @@ -293,6 +316,7 @@ neutron_services: config_options: "--config-file {{ neutron_conf_dir }}/neutron.conf --config-file {{ neutron_conf_dir }}/lbaas_agent.ini --log-file=/var/log/neutron/neutron-lbaasv2-agent.log" config_overrides: "{{ neutron_lbaas_agent_ini_overrides }}" config_type: "ini" + init_config_overrides: "{{ neutron_lbaas_agent_init_overrides }}" neutron-bgp-dragent: group: neutron_bgp_dragent service_name: neutron-bgp-dragent @@ -302,6 +326,7 @@ neutron_services: config_options: "--config-file {{ neutron_conf_dir }}/neutron.conf --config-file {{ neutron_conf_dir }}/bgp_dragent.ini --log-file=/var/log/neutron/neutron-bgp-dragent.log" config_overrides: "{{ neutron_bgp_dragent_ini_overrides }}" config_type: "ini" + init_config_overrides: "{{ neutron_bgp_dragent_init_overrides }}" neutron-vpnaas-agent: group: neutron_l3_agent service_name: neutron-vpn-agent @@ -312,13 +337,17 @@ neutron_services: config_options: "--config-file {{ neutron_conf_dir }}/neutron.conf --config-file {{ neutron_conf_dir }}/vpnaas_agent.ini --log-file=/var/log/neutron/neutron-vpn-agent.log" config_overrides: "{{ neutron_vpnaas_agent_ini_overrides }}" config_type: "ini" + init_config_overrides: "{{ neutron_vpn_agent_init_overrides }}" neutron-server: group: neutron_server service_name: neutron-server service_en: True config_options: "--config-file {{ neutron_conf_dir }}/neutron.conf --config-file {{ neutron_conf_dir }}/{{ neutron_plugins[neutron_plugin_type].plugin_ini }} --log-file=/var/log/neutron/neutron-server.log {% if neutron_plugin_type == 'ml2.dragonflow' %}--config-file {{ neutron_conf_dir }}/dragonflow.ini{% endif %}" + init_config_overrides: "{{ neutron_server_init_overrides }}" calico-felix: group: neutron_calico_dhcp_agent + system_user: root + system_group: root service_name: calico-felix service_en: "{{ neutron_plugin_type == 'ml2.calico' }}" service_conf_path: /etc/calico @@ -326,14 +355,18 @@ neutron_services: config_options: --config-file /etc/calico/felix.cfg config_overrides: "{{ neutron_calico_felix_ini_overrides }}" config_type: "ini" + init_config_overrides: "{{ neutron_calico_felix_init_overrides }}" calico-dhcp-agent: group: neutron_calico_dhcp_agent + system_user: root + system_group: root service_name: calico-dhcp-agent service_en: "{{ neutron_plugin_type == 'ml2.calico' }}" service_rootwrap: rootwrap.d/dhcp.filters config_options: "--config-file {{ neutron_conf_dir }}/neutron.conf" config_overrides: "{{ neutron_calico_dhcp_agent_ini_overrides }}" config_type: "ini" + init_config_overrides: "{{ neutron_calico_dhcp_agent_init_overrides }}" neutron-sriov-nic-agent: group: neutron_sriov_nic_agent service_name: neutron-sriov-nic-agent @@ -343,15 +376,21 @@ neutron_services: config_options: "--config-file {{ neutron_conf_dir }}/neutron.conf --config-file {{ neutron_conf_dir }}/plugins/ml2/ml2_conf.ini --config-file {{ neutron_conf_dir }}/plugins/ml2/sriov_nic_agent.ini --log-file=/var/log/neutron/neutron-sriov-nic-agent.log" config_overrides: "{{ neutron_sriov_nic_agent_ini_overrides }}" config_type: "ini" + init_config_overrides: "{{ neutron_sriov_nic_agent_init_overrides }}" dragonflow-controller-agent: group: dragonflow_controller_agent + system_user: root + system_group: root service_name: df-local-controller service_en: "{{ neutron_plugin_type == 'ml2.dragonflow' }}" config_options: "--config-file {{ neutron_conf_dir }}/neutron.conf --config-file {{ neutron_conf_dir }}/dragonflow.ini --log-file=/var/log/dragonflow/df-local-controller.log" config_overrides: "{{ neutron_dragonflow_ini_overrides }}" config_type: "ini" + init_config_overrides: "{{ neutron_dragonflow_controller_agent_init_overrides }}" dragonflow-l3-agent: group: dragonflow_l3_agent + system_user: root + system_group: root service_name: df-l3-agent service_en: "{{ neutron_plugin_type == 'ml2.dragonflow' and neutron_l3 | bool }}" service_conf_path: "{{ neutron_conf_dir }}" @@ -360,6 +399,7 @@ neutron_services: config_options: "--config-file {{ neutron_conf_dir }}/neutron.conf --config-file {{ neutron_conf_dir }}/l3_agent.ini --log-file=/var/log/dragonflow/df-l3-agent.log" config_overrides: "{{ neutron_dragonflow_ini_overrides }}" config_type: "ini" + init_config_overrides: "{{ neutron_dragonflow_l3_agent_init_overrides }}" dragonflow-pubsub-agent: group: dragonflow_pubsub_agent service_name: df-publisher-service @@ -367,6 +407,7 @@ neutron_services: config_options: "--config-file {{ neutron_conf_dir }}/neutron.conf --config-file {{ neutron_conf_dir }}/dragonflow.ini --log-file=/var/log/dragonflow/df-publisher-service.log" config_overrides: "{{ neutron_dragonflow_ini_overrides }}" config_type: "ini" + init_config_overrides: "{{ neutron_dragonflow_pubsub_agent_init_overrides }}" ## Neutron DHCP Agent neutron_dhcp: "{% if neutron_plugin_type.split('.')[0] == 'ml2' %}True{% else %}False{% endif %}" diff --git a/handlers/main.yml b/handlers/main.yml index 31994939..3bc736b9 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -13,6 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. +- name: Reload systemd daemon + command: "systemctl daemon-reload" + notify: + - Restart neutron services + - name: Restart neutron services service: name: "{{ item.value.service_name }}" diff --git a/releasenotes/notes/neutron-init-config-overrides-ffce7e419061c4da.yaml b/releasenotes/notes/neutron-init-config-overrides-ffce7e419061c4da.yaml new file mode 100644 index 00000000..fba1b244 --- /dev/null +++ b/releasenotes/notes/neutron-init-config-overrides-ffce7e419061c4da.yaml @@ -0,0 +1,10 @@ +--- +features: + - New variables have been added to allow a deployer to customize + a neutron systemd unit file to their liking. + - The task dropping the neutron systemd unit files now uses the + ``config_template`` action plugin allowing deployers access to + customize the unit files as they see fit without having to + load extra options into the defaults and polute the generic + systemd unit file with jinja2 variables and conditionals. + diff --git a/tasks/calico_init.yml b/tasks/calico_init.yml deleted file mode 100644 index 7231a315..00000000 --- a/tasks/calico_init.yml +++ /dev/null @@ -1,38 +0,0 @@ ---- -# Copyright 2016, Logan Vig -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -- include: neutron_init_common.yml - vars: - program_name: "{{ neutron_services['calico-felix'].service_name }}" - program_config_options: "{{ neutron_services['calico-felix'].config_options }}" - service_name: "{{ neutron_service_name }}" - system_user: root - system_group: root - service_home: "{{ neutron_system_home_folder }}" - when: - - neutron_services['calico-felix']['group'] in group_names - - neutron_services['calico-felix'].service_en | bool - -- include: neutron_init_common.yml - vars: - program_name: "{{ neutron_services['calico-dhcp-agent'].service_name }}" - program_config_options: "{{ neutron_services['calico-dhcp-agent'].config_options }}" - service_name: "{{ neutron_service_name }}" - system_user: root - system_group: root - service_home: "{{ neutron_system_home_folder }}" - when: - - neutron_services['calico-dhcp-agent']['group'] in group_names - - neutron_services['calico-dhcp-agent'].service_en | bool diff --git a/tasks/dragonflow.yml b/tasks/dragonflow.yml index e6c13482..5faff31c 100644 --- a/tasks/dragonflow.yml +++ b/tasks/dragonflow.yml @@ -75,45 +75,3 @@ when: - (inventory_hostname in groups[neutron_services['dragonflow-l3-agent']['group']]) or (inventory_hostname in groups[neutron_services['dragonflow-controller-agent']['group']]) - -# Start Dragonflow publisher service -- include: neutron_init_common.yml - vars: - program_name: "{{ neutron_services['dragonflow-pubsub-agent'].service_name }}" - program_config_options: "{{ neutron_services['dragonflow-pubsub-agent'].config_options }}" - system_user: "{{ neutron_system_user_name }}" - system_group: "{{ neutron_system_group_name }}" - service_home: "{{ neutron_system_home_folder }}" - when: - - neutron_services['dragonflow-pubsub-agent']['group'] in group_names - - neutron_services['dragonflow-pubsub-agent'].service_en | bool - tags: - - upstart-init - -# Start Dragonflow publisher service -- include: neutron_init_common.yml - vars: - program_name: "{{ neutron_services['dragonflow-l3-agent'].service_name }}" - program_config_options: "{{ neutron_services['dragonflow-l3-agent'].config_options }}" - system_user: root - system_group: root - service_home: "{{ neutron_system_home_folder }}" - when: - - neutron_services['dragonflow-l3-agent']['group'] in group_names - - neutron_services['dragonflow-l3-agent'].service_en | bool - tags: - - upstart-init - -# Start Dragonflow controller agent -- include: neutron_init_common.yml - vars: - program_name: "{{ neutron_services['dragonflow-controller-agent'].service_name }}" - program_config_options: "{{ neutron_services['dragonflow-controller-agent'].config_options }}" - system_user: root - system_group: root - service_home: "{{ neutron_system_home_folder }}" - when: - - neutron_services['dragonflow-controller-agent']['group'] in group_names - - neutron_services['dragonflow-controller-agent'].service_en | bool - tags: - - upstart-init diff --git a/tasks/main.yml b/tasks/main.yml index 7dc83198..ed586ff8 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -63,22 +63,16 @@ tags: - neutron-config -# neutron system services -- include: neutron_init.yml - tags: - - neutron-config - -- include: calico_init.yml - static: no - when: neutron_plugin_type == 'ml2.calico' - tags: - - neutron-config - - include: dragonflow.yml when: neutron_plugin_type == 'ml2.dragonflow' tags: - neutron-install +# neutron system services +- include: neutron_init_common.yml + tags: + - neutron-config + - include: neutron_db_setup.yml when: - neutron_services['neutron-server']['group'] in group_names diff --git a/tasks/neutron_init.yml b/tasks/neutron_init.yml deleted file mode 100644 index fb0572c2..00000000 --- a/tasks/neutron_init.yml +++ /dev/null @@ -1,148 +0,0 @@ ---- -# Copyright 2014, Rackspace US, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -- include: neutron_init_common.yml - vars: - program_name: "{{ neutron_services['neutron-server'].service_name }}" - program_config_options: "{{ neutron_services['neutron-server'].config_options }}" - service_name: "{{ neutron_service_name }}" - system_user: "{{ neutron_system_user_name }}" - system_group: "{{ neutron_system_group_name }}" - service_home: "{{ neutron_system_home_folder }}" - when: - - neutron_services['neutron-server']['group'] in group_names - - neutron_services['neutron-server'].service_en | bool - -- include: neutron_init_common.yml - vars: - program_name: "{{ neutron_services['neutron-dhcp-agent'].service_name }}" - program_config_options: "{{ neutron_services['neutron-dhcp-agent'].config_options }}" - service_name: "{{ neutron_service_name }}" - system_user: "{{ neutron_system_user_name }}" - system_group: "{{ neutron_system_group_name }}" - service_home: "{{ neutron_system_home_folder }}" - when: - - neutron_services['neutron-dhcp-agent']['group'] in group_names - - neutron_services['neutron-dhcp-agent'].service_en | bool - -- include: neutron_init_common.yml - vars: - program_name: "{{ neutron_services['neutron-l3-agent'].service_name }}" - program_config_options: "{{ neutron_services['neutron-l3-agent'].config_options }}" - service_name: "{{ neutron_service_name }}" - system_user: "{{ neutron_system_user_name }}" - system_group: "{{ neutron_system_group_name }}" - service_home: "{{ neutron_system_home_folder }}" - when: - - neutron_services['neutron-l3-agent']['group'] in group_names - - neutron_services['neutron-l3-agent'].service_en | bool - -- include: neutron_init_common.yml - vars: - program_name: "{{ neutron_services['neutron-linuxbridge-agent'].service_name }}" - program_config_options: "{{ neutron_services['neutron-linuxbridge-agent'].config_options }}" - service_name: "{{ neutron_service_name }}" - system_user: "{{ neutron_system_user_name }}" - system_group: "{{ neutron_system_group_name }}" - service_home: "{{ neutron_system_home_folder }}" - when: - - neutron_services['neutron-linuxbridge-agent']['group'] in group_names - - neutron_services['neutron-linuxbridge-agent'].service_en | bool - -- include: neutron_init_common.yml - vars: - program_name: "{{ neutron_services['neutron-openvswitch-agent'].service_name }}" - program_config_options: "{{ neutron_services['neutron-openvswitch-agent'].config_options }}" - service_name: "{{ neutron_service_name }}" - system_user: "{{ neutron_system_user_name }}" - system_group: "{{ neutron_system_group_name }}" - service_home: "{{ neutron_system_home_folder }}" - when: - - neutron_services['neutron-openvswitch-agent']['group'] in group_names - - neutron_services['neutron-openvswitch-agent'].service_en | bool - -- include: neutron_init_common.yml - vars: - program_name: "{{ neutron_services['neutron-metadata-agent'].service_name }}" - program_config_options: "{{ neutron_services['neutron-metadata-agent'].config_options }}" - service_name: "{{ neutron_service_name }}" - system_user: "{{ neutron_system_user_name }}" - system_group: "{{ neutron_system_group_name }}" - service_home: "{{ neutron_system_home_folder }}" - when: - - neutron_services['neutron-metadata-agent']['group'] in group_names - - neutron_services['neutron-metadata-agent'].service_en | bool - -- include: neutron_init_common.yml - vars: - program_name: "{{ neutron_services['neutron-metering-agent'].service_name }}" - program_config_options: "{{ neutron_services['neutron-metering-agent'].config_options }}" - service_name: "{{ neutron_service_name }}" - system_user: "{{ neutron_system_user_name }}" - system_group: "{{ neutron_system_group_name }}" - service_home: "{{ neutron_system_home_folder }}" - when: - - neutron_services['neutron-metering-agent']['group'] in group_names - - neutron_services['neutron-metering-agent'].service_en | bool - -- include: neutron_init_common.yml - vars: - program_name: "{{ neutron_services['neutron-lbaasv2-agent'].service_name }}" - program_config_options: "{{ neutron_services['neutron-lbaasv2-agent'].config_options }}" - service_name: "{{ neutron_service_name }}" - system_user: "{{ neutron_system_user_name }}" - system_group: "{{ neutron_system_group_name }}" - service_home: "{{ neutron_system_home_folder }}" - when: - - neutron_services['neutron-lbaasv2-agent']['group'] in group_names - - neutron_services['neutron-lbaasv2-agent'].service_en | bool - - neutron_lbaas_namespace | bool - -- include: neutron_init_common.yml - vars: - program_name: "{{ neutron_services['neutron-bgp-dragent'].service_name }}" - program_config_options: "{{ neutron_services['neutron-bgp-dragent'].config_options }}" - service_name: "{{ neutron_service_name }}" - system_user: "{{ neutron_system_user_name }}" - system_group: "{{ neutron_system_group_name }}" - service_home: "{{ neutron_system_home_folder }}" - when: - - neutron_services['neutron-bgp-dragent']['group'] in group_names - - neutron_services['neutron-bgp-dragent'].service_en | bool - -- include: neutron_init_common.yml - vars: - program_name: "{{ neutron_services['neutron-vpnaas-agent'].service_name }}" - program_config_options: "{{ neutron_services['neutron-vpnaas-agent'].config_options }}" - service_name: "{{ neutron_service_name }}" - system_user: "{{ neutron_system_user_name }}" - system_group: "{{ neutron_system_group_name }}" - service_home: "{{ neutron_system_home_folder }}" - when: - - neutron_services['neutron-vpnaas-agent']['group'] in group_names - - neutron_services['neutron-vpnaas-agent'].service_en | bool - -- include: neutron_init_common.yml - vars: - program_name: "{{ neutron_services['neutron-sriov-nic-agent'].service_name }}" - program_config_options: "{{ neutron_services['neutron-sriov-nic-agent'].config_options }}" - service_name: "{{ neutron_service_name }}" - system_user: "{{ neutron_system_user_name }}" - system_group: "{{ neutron_system_group_name }}" - service_home: "{{ neutron_system_home_folder }}" - when: - - neutron_services['neutron-sriov-nic-agent']['group'] in group_names - - neutron_services['neutron-sriov-nic-agent'].service_en | bool - diff --git a/tasks/neutron_init_common.yml b/tasks/neutron_init_common.yml index afe62d5b..9dd16e2a 100644 --- a/tasks/neutron_init_common.yml +++ b/tasks/neutron_init_common.yml @@ -1,5 +1,5 @@ --- -# Copyright 2016, Rackspace US, Inc. +# Copyright 2014, Rackspace US, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,44 +13,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -- name: "Create TEMP run dir for {{ program_name }}" - file: - path: "/var/run/{{ program_name }}" - state: directory - owner: "{{ system_user }}" - group: "{{ system_group }}" - mode: "02755" +- include: neutron_init_systemd.yml + static: no + when: + - ansible_service_mgr == 'systemd' -- name: "Create TEMP lock dir for {{ program_name }}" - file: - path: "/var/lock/{{ program_name }}" - state: directory - owner: "{{ system_user }}" - group: "{{ system_group }}" - mode: "02755" - -- name: "Create tmpfiles.d entry for {{ program_name }}" - template: - src: "neutron-systemd-tmpfiles.j2" - dest: "/etc/tmpfiles.d/openstack-{{ program_name }}.conf" - mode: "0644" - owner: "root" - group: "root" - -- name: "Place the systemd init script for {{ program_name }}" - template: - src: "neutron-systemd-init.j2" - dest: "/etc/systemd/system/{{ program_name }}.service" - mode: "0644" - owner: "root" - group: "root" - register: systemd_init - -- name: "Load {{ program_name }} service" +- name: Load service service: - name: "{{ program_name }}" - enabled: yes - state: started - daemon_reload: yes + name: "{{ item.value.service_name }}" + enabled: "yes" + with_dict: "{{ neutron_services }}" + when: + - inventory_hostname in groups[item.value.group] | default([]) + - "{{ item.value.service_en | default(true) }}" notify: - Restart neutron services diff --git a/tasks/neutron_init_systemd.yml b/tasks/neutron_init_systemd.yml new file mode 100644 index 00000000..7a3eeb2c --- /dev/null +++ b/tasks/neutron_init_systemd.yml @@ -0,0 +1,68 @@ +--- +# Copyright 2016, Rackspace US, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +- name: Create TEMP run dir + file: + path: "/var/run/{{ item.value.service_name }}" + state: directory + owner: "{{ neutron_system_user_name }}" + group: "{{ neutron_system_group_name }}" + mode: "02755" + with_dict: "{{ neutron_services }}" + when: inventory_hostname in groups[item.value.group] | default([]) + +- name: Create TEMP lock dir + file: + path: "/var/lock/{{ item.value.service_name }}" + state: directory + owner: "{{ neutron_system_user_name }}" + group: "{{ neutron_system_group_name }}" + mode: "02755" + with_dict: "{{ neutron_services }}" + when: inventory_hostname in groups[item.value.group] | default([]) + +# TODO(mgariepy): +# Remove this in Pike as it only needed to handle upgrades +# from Newton->Newton and Newton->Ocata +- name: Cleanup old tmpfiles.d entry + file: + path: "/etc/tmpfiles.d/{{ item.value.service_name }}.conf" + state: absent + with_dict: "{{ neutron_services }}" + when: inventory_hostname in groups[item.value.group] | default([]) + +- name: Create tmpfiles.d entry + template: + src: "neutron-systemd-tmpfiles.j2" + dest: "/etc/tmpfiles.d/openstack-{{ item.value.service_name }}.conf" + mode: "0644" + owner: "root" + group: "root" + with_dict: "{{ neutron_services }}" + when: inventory_hostname in groups[item.value.group] | default([]) + +- name: Place the systemd init script + config_template: + src: "neutron-systemd-init.j2" + dest: "/etc/systemd/system/{{ item.value.service_name }}.service" + mode: "0644" + owner: "root" + group: "root" + config_overrides: "{{ item.value.init_config_overrides }}" + config_type: "ini" + with_dict: "{{ neutron_services }}" + when: inventory_hostname in groups[item.value.group] | default([]) + notify: + - Reload systemd daemon diff --git a/templates/neutron-systemd-init.j2 b/templates/neutron-systemd-init.j2 index 184f8502..24cc54e0 100644 --- a/templates/neutron-systemd-init.j2 +++ b/templates/neutron-systemd-init.j2 @@ -7,13 +7,13 @@ After=network.target [Service] Type=simple -User={{ system_user }} -Group={{ system_group }} +User={{ item.value.system_user | default(neutron_system_user_name) }} +Group={{ item.value.system_group | default(neutron_system_group_name) }} -{% if program_override is defined %} -ExecStart={{ program_override }} {{ program_config_options|default('') }} +{% if item.value.program_override is defined %} +ExecStart={{ item.value.program_override }} {{ item.value.config_options|default('') }} {% else %} -ExecStart={{ neutron_bin }}/{{ program_name }} {{ program_config_options|default('') }} +ExecStart={{ neutron_bin }}/{{ item.value.program_binary | default(item.value.service_name) }} {{ item.value.config_options|default('') }} {% endif %} # Give a reasonable amount of time for the server to start up/shut down @@ -21,5 +21,14 @@ TimeoutSec=300 Restart=on-failure RestartSec=150 +# This creates a specific slice which all services will operate from +# The accounting options give us the ability to see resource usage through +# the `systemd-cgtop` command. +Slice=neutron.slice +CPUAccounting=true +BlockIOAccounting=true +MemoryAccounting=false +TasksAccounting=true + [Install] WantedBy=multi-user.target diff --git a/templates/neutron-systemd-tmpfiles.j2 b/templates/neutron-systemd-tmpfiles.j2 index ef8f6bca..e363e2b5 100644 --- a/templates/neutron-systemd-tmpfiles.j2 +++ b/templates/neutron-systemd-tmpfiles.j2 @@ -1,5 +1,5 @@ # {{ ansible_managed }} -D /var/lock/{{ program_name }} 2755 {{ system_user }} {{ system_group }} -D /var/run/{{ program_name }} 2755 {{ system_user }} {{ system_group }} -D {{ neutron_lock_path }} 2755 {{ system_user }} {{ system_group }} +D /var/lock/{{ item.value.program_binary | default(item.value.service_name) }} 2755 {{ item.value.system_user | default(neutron_system_user_name) }} {{ item.value.system_group | default(neutron_system_group_name) }} +D /var/run/{{ item.value.program_binary | default(item.value.service_name) }} 2755 {{ item.value.system_user | default(neutron_system_user_name) }} {{ item.value.system_group | default(neutron_system_group_name) }} +D {{ neutron_lock_path }} 2755 {{ item.value.system_user | default(neutron_system_user_name) }} {{ item.value.system_group | default(neutron_system_group_name) }}