Browse Source

tripleo_container_manage: remove paunch-related tasks

Paunch was removed from TripleO during Victoria Cycle.
tripleo_container_manage was enabled by default in Ussuri.

Therefore there is no need to run these tasks anymore, since they were
suppose to run during a deployment or upgrade of Ussuri.

Change-Id: I4f61dc954695d6c235effd44f16215d5e5401088
changes/69/736769/2
Emilien Macchi 2 weeks ago
parent
commit
ca2ca08333
2 changed files with 0 additions and 43 deletions
  1. +0
    -8
      tripleo_ansible/roles/tripleo_container_manage/tasks/main.yml
  2. +0
    -35
      tripleo_ansible/roles/tripleo_container_manage/tasks/shutdown.yml

+ 0
- 8
tripleo_ansible/roles/tripleo_container_manage/tasks/main.yml View File

@@ -40,14 +40,6 @@
group: root
become: true

- name: Create ansible-managed dropin file
copy:
dest: "{{ tripleo_container_manage_config | dirname }}/.ansible-managed"
content: |
Containers are managed by the tripleo_container_manage role in
tripleo-ansible project. This file is used by paunch to show a warning
if paunch is used against a deployment done with tripleo_container_manage.

- name: Generate containers configs data
no_log: "{{ not tripleo_container_manage_debug }}"
block:


+ 0
- 35
tripleo_ansible/roles/tripleo_container_manage/tasks/shutdown.yml View File

@@ -25,41 +25,6 @@
when:
- podman_drop_in.stat.exists

- name: Cleanup Paunch services and files
block:
- name: Check if /usr/lib/systemd/system/paunch-container-shutdown.service exists
stat:
path: /usr/lib/systemd/system/paunch-container-shutdown.service
register: paunch_shutdown
- name: Tear-down paunch-container-shutdown
when:
- paunch_shutdown.stat.exists
block:
- name: Allow paunch-container-shutdown to be stopped
lineinfile:
path: /usr/lib/systemd/system/paunch-container-shutdown.service
regexp: '^RefuseManualStop'
line: 'RefuseManualStop=no'
- name: Force systemd to reread configs
systemd:
daemon_reload: true
- name: Disable and stop paunch-container-shutdown service
systemd:
name: paunch-container-shutdown
state: stopped
enabled: false
# TODO(emilien): this task can be removed later when paunch isn't a
# dependency of python-tripleoclient. It'll be replaced by an rpm removal.
- name: "Remove paunch files for systemd"
file:
path: "{{ item }}"
state: absent
loop:
- /usr/libexec/paunch-container-shutdown
- /usr/libexec/paunch-start-podman-container
- /usr/lib/systemd/system/paunch-container-shutdown.service
- /usr/lib/systemd/system-preset/91-paunch-container-shutdown.preset

- name: Create TripleO Container systemd service
block:
- name: "Deploy tripleo-container-shutdown and tripleo-start-podman-container"


Loading…
Cancel
Save