Merge pull request #816 from rabi/mask

Mask tripleo services after removing unit files

roles/edpm_tripleo_cleanup/defaults/main.yml

@@ -37,3 +37,4 @@ edpm_service_removal_skip_list:
   - tripleo_swift_object_replicator.service
   - tripleo_swift_object_server.service
   - tripleo_swift_object_updater.service
+  - tripleo-container-shutdown.service

roles/edpm_tripleo_cleanup/tasks/main.yml

@@ -49,7 +49,6 @@
     name: "{{ item }}"
     state: stopped
     enabled: false
-    masked: true
   register: result
   loop: "{{ tripleo_services }}"
   failed_when: false
@@ -74,6 +73,26 @@
     loop_var: path
   when: edpm_remove_tripleo_unit_files
 
+- name: Mask tripleo services to make them unusable
+  tags:
+    - adoption
+  become: true
+  ansible.builtin.systemd_service:
+    name: "{{ item }}"
+    masked: true
+  register: result_mask
+  loop: "{{ tripleo_services }}"
+  failed_when: false
+
+- name: Check for errors
+  ansible.builtin.fail:
+    msg: "Attempt to mask service {{ item.item }} failed with {{ item.msg }}"
+  loop: "{{ result_mask.results }}"
+  when: >
+    ('msg' in item) and
+    (item.msg != '') and
+    ("Could not find the requested service" not in item.msg)
+
 - name: Adopt (stop tracking) certs from tripleo
   tags:
     - adoption