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: Ibcb7d2a69ed67a99c88dc143c76aa8448d31cc9e
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>

defaults/main.yml

@@ -309,93 +309,134 @@ swift_pip_packages:
   - python-swiftclient
   - swift
 
+swift_account_replicator_init_overrides: {}
+swift_account_replicator_server_init_overrides: {}
+swift_account_server_init_overrides: {}
+swift_account_auditor_init_overrides: {}
+swift_account_reaper_init_overrides: {}
+swift_container_replicator_init_overrides: {}
+swift_container_replicator_server_init_overrides: {}
+swift_container_server_init_overrides: {}
+swift_container_auditor_init_overrides: {}
+swift_container_sync_init_overrides: {}
+swift_container_updater_init_overrides: {}
+swift_container_reconciler_init_overrides: {}
+swift_object_replicator_init_overrides: {}
+swift_object_replicator_server_init_overrides: {}
+swift_object_server_init_overrides: {}
+swift_object_auditor_init_overrides: {}
+swift_object_updater_init_overrides: {}
+swift_object_expirer_init_overrides: {}
+swift_object_reconstructor_init_overrides: {}
+swift_proxy_server_init_overrides: {}
+
 swift_services:
   swift-account-replicator:
     group: swift_acc
     program_name: "swift-account-replicator"
     program_config_options: "{{ swift_dedicated_replication | ternary('/etc/swift/account-server/account-server-replicator.conf', '/etc/swift/account-server/account-server.conf') }}"
+    init_config_overrides: "{{ swift_account_replicator_init_overrides }}"
   swift-account-replicator-server:
     group: swift_acc
     program_name: "swift-account-replicator-server"
     program_binary: "swift-account-server"
     program_config_options: "/etc/swift/account-server/account-server-replicator.conf"
     service_en: "{{ swift_dedicated_replication | bool }}"
+    init_config_overrides: "{{ swift_account_replicator_server_init_overrides }}"
   swift-account-server:
     group: swift_acc
     program_name: "swift-account-server"
     program_config_options: "/etc/swift/account-server/account-server.conf"
+    init_config_overrides: "{{ swift_account_server_init_overrides }}"
   swift-account-auditor:
     group: swift_acc
     program_name: "swift-account-auditor"
     program_config_options: "{{ swift_dedicated_replication | ternary('/etc/swift/account-server/account-server-replicator.conf', '/etc/swift/account-server/account-server.conf') }}"
+    init_config_overrides: "{{ swift_account_auditor_init_overrides }}"
   swift-account-reaper:
     group: swift_acc
     program_name: "swift-account-reaper"
     program_config_options: "/etc/swift/account-server/account-server.conf"
+    init_config_overrides: "{{ swift_account_reaper_init_overrides }}"
   swift-container-replicator:
     group: swift_cont
     program_name: "swift-container-replicator"
     program_config_options: "{{ swift_dedicated_replication | ternary('/etc/swift/container-server/container-server-replicator.conf', '/etc/swift/container-server/container-server.conf') }}"
+    init_config_overrides: "{{ swift_container_replicator_init_overrides }}"
   swift-container-replicator-server:
     group: swift_cont
     program_name: "swift-container-replicator-server"
     program_binary: "swift-container-server"
     program_config_options: "/etc/swift/container-server/container-server-replicator.conf"
     service_en: "{{ swift_dedicated_replication | bool }}"
+    init_config_overrides: "{{ swift_container_replicator_server_init_overrides }}"
   swift-container-server:
     group: swift_cont
     program_name: "swift-container-server"
     program_config_options: "/etc/swift/container-server/container-server.conf"
+    init_config_overrides: "{{ swift_container_server_init_overrides }}"
   swift-container-auditor:
     group: swift_cont
     program_name: "swift-container-auditor"
     program_config_options: "{{ swift_dedicated_replication | ternary('/etc/swift/container-server/container-server-replicator.conf', '/etc/swift/container-server/container-server.conf') }}"
+    init_config_overrides: "{{ swift_container_auditor_init_overrides }}"
   swift-container-sync:
     group: swift_cont
     program_name: "swift-container-sync"
     program_config_options: "/etc/swift/container-server/container-server.conf"
+    init_config_overrides: "{{ swift_container_sync_init_overrides }}"
   swift-container-updater:
     group: swift_cont
     program_name: "swift-container-updater"
     program_config_options: "/etc/swift/container-server/container-server.conf"
+    init_config_overrides: "{{ swift_container_updater_init_overrides }}"
   swift-container-reconciler:
     group: swift_cont
     program_name: "swift-container-reconciler"
     program_config_options: "/etc/swift/container-server/container-reconciler.conf"
+    init_config_overrides: "{{ swift_container_reconciler_init_overrides }}"
   swift-object-replicator:
     group: swift_obj
     program_name: "swift-object-replicator"
     program_config_options: "{{ swift_dedicated_replication | ternary('/etc/swift/object-server/object-server-replicator.conf', '/etc/swift/object-server/object-server.conf') }}"
+    init_config_overrides: "{{ swift_object_replicator_init_overrides }}"
   swift-object-replicator-server:
     group: swift_obj
     program_name: "swift-object-replicator-server"
     program_binary: "swift-object-server"
     program_config_options: "/etc/swift/object-server/object-server-replicator.conf"
     service_en: "{{ swift_dedicated_replication | bool }}"
+    init_config_overrides: "{{ swift_object_replicator_server_init_overrides }}"
   swift-object-server:
     group: swift_obj
     program_name: "swift-object-server"
     program_config_options: "/etc/swift/object-server/object-server.conf"
+    init_config_overrides: "{{ swift_object_server_init_overrides }}"
   swift-object-auditor:
     group: swift_obj
     program_name: "swift-object-auditor"
     program_config_options: "{{ swift_dedicated_replication | ternary('/etc/swift/object-server/object-server-replicator.conf', '/etc/swift/object-server/object-server.conf') }}"
+    init_config_overrides: "{{ swift_object_auditor_init_overrides }}"
   swift-object-updater:
     group: swift_obj
     program_name: "swift-object-updater"
     program_config_options: "/etc/swift/object-server/object-server.conf"
+    init_config_overrides: "{{ swift_object_updater_init_overrides }}"
   swift-object-expirer:
     group: swift_obj
     program_name: "swift-object-expirer"
     program_config_options: "/etc/swift/object-server/object-expirer.conf"
+    init_config_overrides: "{{ swift_object_expirer_init_overrides }}"
   swift-object-reconstructor:
     group: swift_obj
     program_name: "swift-object-reconstructor"
     program_config_options: "{{ swift_dedicated_replication | ternary('/etc/swift/object-server/object-server-replicator.conf', '/etc/swift/object-server/object-server.conf') }}"
+    init_config_overrides: "{{ swift_object_reconstructor_init_overrides }}"
   swift-proxy-server:
     group: swift_proxy
     program_name: "swift-proxy-server"
     program_config_options: "/etc/swift/proxy-server/proxy-server.conf"
+    init_config_overrides: "{{ swift_proxy_server_init_overrides }}"
 
 # Set to True to reset the clock on the last time a rebalance happened,
 # circumventing the min_part_hours check.

releasenotes/notes/swift-init-config-overrides-ffce7e419061c4da.yaml

@@ -0,0 +1,10 @@
+---
+features:
+  - New variables have been added to allow a deployer to customize
+    a swift systemd unit file to their liking.
+  - The task dropping the swift 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.
+

tasks/swift_init_systemd.yml

@@ -54,12 +54,14 @@
   when: inventory_hostname in groups[item.value.group]
 
 - name: Place the systemd init script
-  template:
+  config_template:
     src: "swift-systemd-init.j2"
     dest: "/etc/systemd/system/{{ item.value.program_name }}.service"
     mode: "0644"
     owner: "root"
     group: "root"
+    config_overrides: "{{ item.value.init_config_overrides }}"
+    config_type: "ini"
   with_dict: "{{ swift_services }}"
   when: inventory_hostname in groups[item.value.group]
   notify:

templates/swift-systemd-init.j2

@@ -29,5 +29,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=swift.slice
+CPUAccounting=true
+BlockIOAccounting=true
+MemoryAccounting=false
+TasksAccounting=true
+
 [Install]
 WantedBy=multi-user.target