From 20583e83dd0fe00dbac4d87bb6acf710e7ba710e Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Tue, 10 Aug 2021 15:21:19 +0200 Subject: [PATCH] containers: introduce target systemd unit This adds ceph-*.target systemd unit files support for containerized deployments. This also fixes a regression introduced by PR #6719 (rgw and nfs systemd units not getting purged) Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1962748 Signed-off-by: Guillaume Abrioux (cherry picked from commit 09ef465f62fde775bd2490be5b43d7796e2a9c6c) --- infrastructure-playbooks/purge-cluster.yml | 39 ++++++++++++++----- roles/ceph-container-common/files/ceph.target | 5 +++ roles/ceph-container-common/tasks/main.yml | 11 ++++++ .../templates/ceph-crash.service.j2 | 2 +- roles/ceph-mds/files/ceph-mds.target | 9 +++++ roles/ceph-mds/tasks/containerized.yml | 7 ++++ roles/ceph-mds/tasks/systemd.yml | 6 +++ roles/ceph-mds/templates/ceph-mds.service.j2 | 3 +- roles/ceph-mgr/files/ceph-mgr.target | 9 +++++ roles/ceph-mgr/tasks/start_mgr.yml | 7 ++++ roles/ceph-mgr/tasks/systemd.yml | 6 +++ roles/ceph-mgr/templates/ceph-mgr.service.j2 | 3 +- roles/ceph-mon/files/ceph-mon.target | 8 ++++ roles/ceph-mon/tasks/systemd.yml | 13 +++++++ roles/ceph-mon/templates/ceph-mon.service.j2 | 3 +- roles/ceph-osd/files/ceph-osd.target | 9 +++++ roles/ceph-osd/tasks/systemd.yml | 13 +++++++ roles/ceph-osd/templates/ceph-osd.service.j2 | 3 +- .../files/ceph-rbd-mirror.target | 7 ++++ roles/ceph-rbd-mirror/tasks/systemd.yml | 13 +++++++ .../templates/ceph-rbd-mirror.service.j2 | 3 +- roles/ceph-rgw/files/ceph-radosgw.target | 9 +++++ roles/ceph-rgw/tasks/systemd.yml | 15 ++++++- .../templates/ceph-radosgw.service.j2 | 3 +- 24 files changed, 189 insertions(+), 17 deletions(-) create mode 100644 roles/ceph-container-common/files/ceph.target create mode 100644 roles/ceph-mds/files/ceph-mds.target create mode 100644 roles/ceph-mgr/files/ceph-mgr.target create mode 100644 roles/ceph-mon/files/ceph-mon.target create mode 100644 roles/ceph-osd/files/ceph-osd.target create mode 100644 roles/ceph-rbd-mirror/files/ceph-rbd-mirror.target create mode 100644 roles/ceph-rgw/files/ceph-radosgw.target diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml index d668ed1e3..beee11691 100644 --- a/infrastructure-playbooks/purge-cluster.yml +++ b/infrastructure-playbooks/purge-cluster.yml @@ -248,8 +248,11 @@ - name: remove ceph mds service file: - path: /etc/systemd/system/ceph-mds@.service + path: /etc/systemd/system/ceph-mds{{ item }} state: absent + loop: + - '@.service' + - '.target' - name: purge ceph mgr cluster @@ -267,9 +270,11 @@ - name: remove ceph mgr service file: - path: /etc/systemd/system/ceph-mgr@.service + path: /etc/systemd/system/ceph-mgr{{ item }} state: absent - + loop: + - '@.service' + - '.target' - name: purge rgwloadbalancer cluster hosts: rgwloadbalancers @@ -304,6 +309,14 @@ failed_when: false with_items: "{{ rgw_instances }}" + - name: remove ceph rgw service + file: + path: /etc/systemd/system/ceph-radosgw{{ item }} + state: absent + loop: + - '@.service' + - '.target' + - name: purge ceph rbd-mirror cluster hosts: rbdmirrors @@ -317,6 +330,14 @@ enabled: no failed_when: false + - name: remove ceph rbd-mirror service + file: + path: /etc/systemd/system/ceph-rbd-mirror{{ item }} + state: absent + loop: + - '@.service' + - '.target' + - name: purge ceph osd cluster vars: @@ -599,9 +620,11 @@ - name: remove ceph osd service file: - path: /etc/systemd/system/ceph-osd@.service + path: /etc/systemd/system/ceph-osd{{ item }} state: absent - when: containerized_deployment | bool + loop: + - '@.service' + - '.target' - name: purge ceph mon cluster hosts: mons @@ -633,11 +656,9 @@ - name: remove ceph mon and mgr service file: - path: "/etc/systemd/system/ceph-{{ item }}@.service" + path: "/etc/systemd/system/ceph-{{ item.0 }}{{ item.1 }}" state: absent - with_items: - - mon - - mgr + loop: "{{ ['mon', 'mgr'] | product(['@.service', '.target']) | list }}" - name: purge ceph-crash daemons diff --git a/roles/ceph-container-common/files/ceph.target b/roles/ceph-container-common/files/ceph.target new file mode 100644 index 000000000..9c09851df --- /dev/null +++ b/roles/ceph-container-common/files/ceph.target @@ -0,0 +1,5 @@ +[Unit] +Description=ceph target allowing to start/stop all ceph*@.service instances at once + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/roles/ceph-container-common/tasks/main.yml b/roles/ceph-container-common/tasks/main.yml index aa9139b0d..4b663eb30 100644 --- a/roles/ceph-container-common/tasks/main.yml +++ b/roles/ceph-container-common/tasks/main.yml @@ -1,4 +1,15 @@ --- +- name: generate systemd ceph-mon target file + copy: + src: ceph.target + dest: /etc/systemd/system/ceph.target + +- name: enable ceph.target + service: + name: ceph.target + enabled: yes + daemon_reload: yes + - name: include prerequisites.yml include_tasks: prerequisites.yml diff --git a/roles/ceph-crash/templates/ceph-crash.service.j2 b/roles/ceph-crash/templates/ceph-crash.service.j2 index 5343d02df..61b8740bc 100644 --- a/roles/ceph-crash/templates/ceph-crash.service.j2 +++ b/roles/ceph-crash/templates/ceph-crash.service.j2 @@ -41,4 +41,4 @@ TimeoutStartSec=120 TimeoutStopSec=10 [Install] -WantedBy=multi-user.target +WantedBy=ceph.target diff --git a/roles/ceph-mds/files/ceph-mds.target b/roles/ceph-mds/files/ceph-mds.target new file mode 100644 index 000000000..ae153877b --- /dev/null +++ b/roles/ceph-mds/files/ceph-mds.target @@ -0,0 +1,9 @@ +[Unit] +Description=ceph target allowing to start/stop all ceph-mds@.service instances at once +PartOf=ceph.target +After=ceph-mon.target +Before=ceph.target +Wants=ceph.target ceph-mon.target + +[Install] +WantedBy=multi-user.target ceph.target \ No newline at end of file diff --git a/roles/ceph-mds/tasks/containerized.yml b/roles/ceph-mds/tasks/containerized.yml index 8919366ba..49f5add72 100644 --- a/roles/ceph-mds/tasks/containerized.yml +++ b/roles/ceph-mds/tasks/containerized.yml @@ -2,6 +2,13 @@ - name: include_tasks systemd.yml include_tasks: systemd.yml +- name: enable ceph-mds.target + service: + name: ceph-mds.target + enabled: yes + daemon_reload: yes + when: containerized_deployment | bool + - name: systemd start mds container systemd: name: ceph-mds@{{ ansible_facts['hostname'] }} diff --git a/roles/ceph-mds/tasks/systemd.yml b/roles/ceph-mds/tasks/systemd.yml index b76e11e61..f6970828e 100644 --- a/roles/ceph-mds/tasks/systemd.yml +++ b/roles/ceph-mds/tasks/systemd.yml @@ -7,3 +7,9 @@ group: "root" mode: "0644" notify: restart ceph mdss + +- name: generate systemd ceph-mds target file + copy: + src: ceph-mds.target + dest: /etc/systemd/system/ceph-mds.target + when: containerized_deployment | bool \ No newline at end of file diff --git a/roles/ceph-mds/templates/ceph-mds.service.j2 b/roles/ceph-mds/templates/ceph-mds.service.j2 index 54b2d7ac8..c79300443 100644 --- a/roles/ceph-mds/templates/ceph-mds.service.j2 +++ b/roles/ceph-mds/templates/ceph-mds.service.j2 @@ -1,5 +1,6 @@ [Unit] Description=Ceph MDS +PartOf=ceph-mds.target {% if container_binary == 'docker' %} After=docker.service Requires=docker.service @@ -53,4 +54,4 @@ PIDFile=/%t/%n-pid {% endif %} [Install] -WantedBy=multi-user.target +WantedBy=ceph.target diff --git a/roles/ceph-mgr/files/ceph-mgr.target b/roles/ceph-mgr/files/ceph-mgr.target new file mode 100644 index 000000000..abb259804 --- /dev/null +++ b/roles/ceph-mgr/files/ceph-mgr.target @@ -0,0 +1,9 @@ +[Unit] +Description=ceph target allowing to start/stop all ceph-mgr@.service instances at once +PartOf=ceph.target +After=ceph-mon.target +Before=ceph.target +Wants=ceph.target ceph-mon.target + +[Install] +WantedBy=multi-user.target ceph.target \ No newline at end of file diff --git a/roles/ceph-mgr/tasks/start_mgr.yml b/roles/ceph-mgr/tasks/start_mgr.yml index 658ca9758..ba38cf15c 100644 --- a/roles/ceph-mgr/tasks/start_mgr.yml +++ b/roles/ceph-mgr/tasks/start_mgr.yml @@ -21,6 +21,13 @@ include_tasks: systemd.yml when: containerized_deployment | bool +- name: enable ceph-mgr.target + service: + name: ceph-mgr.target + enabled: yes + daemon_reload: yes + when: containerized_deployment | bool + - name: systemd start mgr systemd: name: ceph-mgr@{{ ansible_facts['hostname'] }} diff --git a/roles/ceph-mgr/tasks/systemd.yml b/roles/ceph-mgr/tasks/systemd.yml index 2457a0e3f..2cfadc8ca 100644 --- a/roles/ceph-mgr/tasks/systemd.yml +++ b/roles/ceph-mgr/tasks/systemd.yml @@ -7,3 +7,9 @@ group: "root" mode: "0644" notify: restart ceph mgrs + +- name: generate systemd ceph-mgr target file + copy: + src: ceph-mgr.target + dest: /etc/systemd/system/ceph-mgr.target + when: containerized_deployment | bool \ No newline at end of file diff --git a/roles/ceph-mgr/templates/ceph-mgr.service.j2 b/roles/ceph-mgr/templates/ceph-mgr.service.j2 index 2cca6364b..dd8a18a20 100644 --- a/roles/ceph-mgr/templates/ceph-mgr.service.j2 +++ b/roles/ceph-mgr/templates/ceph-mgr.service.j2 @@ -1,5 +1,6 @@ [Unit] Description=Ceph Manager +PartOf=ceph-mgr.target {% if container_binary == 'docker' %} After=docker.service Requires=docker.service @@ -52,4 +53,4 @@ PIDFile=/%t/%n-pid {% endif %} [Install] -WantedBy=multi-user.target +WantedBy=ceph.target diff --git a/roles/ceph-mon/files/ceph-mon.target b/roles/ceph-mon/files/ceph-mon.target new file mode 100644 index 000000000..b27d34be5 --- /dev/null +++ b/roles/ceph-mon/files/ceph-mon.target @@ -0,0 +1,8 @@ +[Unit] +Description=ceph target allowing to start/stop all ceph-mon@.service instances at once +PartOf=ceph.target +Before=ceph.target +Wants=ceph.target + +[Install] +WantedBy=multi-user.target ceph.target \ No newline at end of file diff --git a/roles/ceph-mon/tasks/systemd.yml b/roles/ceph-mon/tasks/systemd.yml index 9af8a59bf..ba90b7448 100644 --- a/roles/ceph-mon/tasks/systemd.yml +++ b/roles/ceph-mon/tasks/systemd.yml @@ -7,3 +7,16 @@ group: "root" mode: "0644" notify: restart ceph mons + +- name: generate systemd ceph-mon target file + copy: + src: ceph-mon.target + dest: /etc/systemd/system/ceph-mon.target + when: containerized_deployment | bool + +- name: enable ceph-mon.target + service: + name: ceph-mon.target + enabled: yes + daemon_reload: yes + when: containerized_deployment | bool \ No newline at end of file diff --git a/roles/ceph-mon/templates/ceph-mon.service.j2 b/roles/ceph-mon/templates/ceph-mon.service.j2 index bdcc1063b..eb1c623dc 100644 --- a/roles/ceph-mon/templates/ceph-mon.service.j2 +++ b/roles/ceph-mon/templates/ceph-mon.service.j2 @@ -1,5 +1,6 @@ [Unit] Description=Ceph Monitor +PartOf=ceph-mon.target {% if container_binary == 'docker' %} After=docker.service Requires=docker.service @@ -67,4 +68,4 @@ PIDFile=/%t/%n-pid {% endif %} [Install] -WantedBy=multi-user.target +WantedBy=ceph.target diff --git a/roles/ceph-osd/files/ceph-osd.target b/roles/ceph-osd/files/ceph-osd.target new file mode 100644 index 000000000..bb0630340 --- /dev/null +++ b/roles/ceph-osd/files/ceph-osd.target @@ -0,0 +1,9 @@ +[Unit] +Description=ceph target allowing to start/stop all ceph-osd@.service instances at once +PartOf=ceph.target +After=ceph-mon.target +Before=ceph.target +Wants=ceph.target ceph-mon.target + +[Install] +WantedBy=multi-user.target ceph.target \ No newline at end of file diff --git a/roles/ceph-osd/tasks/systemd.yml b/roles/ceph-osd/tasks/systemd.yml index 367d49ec3..6d4685bb6 100644 --- a/roles/ceph-osd/tasks/systemd.yml +++ b/roles/ceph-osd/tasks/systemd.yml @@ -7,3 +7,16 @@ group: "root" mode: "0644" notify: restart ceph osds + +- name: generate systemd ceph-osd target file + copy: + src: ceph-osd.target + dest: /etc/systemd/system/ceph-osd.target + when: containerized_deployment | bool + +- name: enable ceph-osd.target + service: + name: ceph-osd.target + enabled: yes + daemon_reload: yes + when: containerized_deployment | bool \ No newline at end of file diff --git a/roles/ceph-osd/templates/ceph-osd.service.j2 b/roles/ceph-osd/templates/ceph-osd.service.j2 index 75ea7195a..dd8295385 100644 --- a/roles/ceph-osd/templates/ceph-osd.service.j2 +++ b/roles/ceph-osd/templates/ceph-osd.service.j2 @@ -1,6 +1,7 @@ # {{ ansible_managed }} [Unit] Description=Ceph OSD +PartOf=ceph-osd.target {% if container_binary == 'docker' %} After=docker.service Requires=docker.service @@ -79,4 +80,4 @@ PIDFile=/%t/%n-pid {% endif %} [Install] -WantedBy=multi-user.target +WantedBy=ceph.target diff --git a/roles/ceph-rbd-mirror/files/ceph-rbd-mirror.target b/roles/ceph-rbd-mirror/files/ceph-rbd-mirror.target new file mode 100644 index 000000000..7c67ce9bb --- /dev/null +++ b/roles/ceph-rbd-mirror/files/ceph-rbd-mirror.target @@ -0,0 +1,7 @@ +[Unit] +Description=ceph target allowing to start/stop all ceph-rbd-mirror@.service instances at once +PartOf=ceph.target +Before=ceph.target + +[Install] +WantedBy=multi-user.target ceph.target \ No newline at end of file diff --git a/roles/ceph-rbd-mirror/tasks/systemd.yml b/roles/ceph-rbd-mirror/tasks/systemd.yml index 16dfb139f..60977e671 100644 --- a/roles/ceph-rbd-mirror/tasks/systemd.yml +++ b/roles/ceph-rbd-mirror/tasks/systemd.yml @@ -7,3 +7,16 @@ group: "root" mode: "0644" notify: restart ceph rbdmirrors + +- name: generate systemd ceph-rbd-mirror target file + copy: + src: ceph-rbd-mirror.target + dest: /etc/systemd/system/ceph-rbd-mirror.target + when: containerized_deployment | bool + +- name: enable ceph-rbd-mirror.target + service: + name: ceph-rbd-mirror.target + enabled: yes + daemon_reload: yes + when: containerized_deployment | bool \ No newline at end of file diff --git a/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2 b/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2 index c9e87acdd..847e05f0f 100644 --- a/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2 +++ b/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2 @@ -1,5 +1,6 @@ [Unit] Description=Ceph RBD mirror +PartOf=ceph-rbd-mirror.target {% if container_binary == 'docker' %} After=docker.service Requires=docker.service @@ -52,4 +53,4 @@ PIDFile=/%t/%n-pid {% endif %} [Install] -WantedBy=multi-user.target +WantedBy=ceph.target diff --git a/roles/ceph-rgw/files/ceph-radosgw.target b/roles/ceph-rgw/files/ceph-radosgw.target new file mode 100644 index 000000000..3f1b1c88d --- /dev/null +++ b/roles/ceph-rgw/files/ceph-radosgw.target @@ -0,0 +1,9 @@ +[Unit] +Description=ceph target allowing to start/stop all ceph-radosgw@.service instances at once +PartOf=ceph.target +After=ceph-mon.target +Before=ceph.target +Wants=ceph.target ceph-mon.target + +[Install] +WantedBy=multi-user.target ceph.target \ No newline at end of file diff --git a/roles/ceph-rgw/tasks/systemd.yml b/roles/ceph-rgw/tasks/systemd.yml index ab114ca08..08457ec2f 100644 --- a/roles/ceph-rgw/tasks/systemd.yml +++ b/roles/ceph-rgw/tasks/systemd.yml @@ -6,4 +6,17 @@ owner: "root" group: "root" mode: "0644" - notify: restart ceph rgws \ No newline at end of file + notify: restart ceph rgws + +- name: generate systemd ceph-radosgw target file + copy: + src: ceph-radosgw.target + dest: /etc/systemd/system/ceph-radosgw.target + when: containerized_deployment | bool + +- name: enable ceph-radosgw.target + service: + name: ceph-radosgw.target + enabled: yes + daemon_reload: yes + when: containerized_deployment | bool \ No newline at end of file diff --git a/roles/ceph-rgw/templates/ceph-radosgw.service.j2 b/roles/ceph-rgw/templates/ceph-radosgw.service.j2 index 881b970ab..31a40606a 100644 --- a/roles/ceph-rgw/templates/ceph-radosgw.service.j2 +++ b/roles/ceph-rgw/templates/ceph-radosgw.service.j2 @@ -1,5 +1,6 @@ [Unit] Description=Ceph RGW +PartOf=ceph-radosgw.target {% if container_binary == 'docker' %} After=docker.service Requires=docker.service @@ -66,4 +67,4 @@ PIDFile=/%t/%n-pid {% endif %} [Install] -WantedBy=multi-user.target +WantedBy=ceph.target