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
This commit is contained in:
parent
e5c35bdb7a
commit
ca2ca08333
|
@ -40,14 +40,6 @@
|
||||||
group: root
|
group: root
|
||||||
become: true
|
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
|
- name: Generate containers configs data
|
||||||
no_log: "{{ not tripleo_container_manage_debug }}"
|
no_log: "{{ not tripleo_container_manage_debug }}"
|
||||||
block:
|
block:
|
||||||
|
|
|
@ -25,41 +25,6 @@
|
||||||
when:
|
when:
|
||||||
- podman_drop_in.stat.exists
|
- 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
|
- name: Create TripleO Container systemd service
|
||||||
block:
|
block:
|
||||||
- name: "Deploy tripleo-container-shutdown and tripleo-start-podman-container"
|
- name: "Deploy tripleo-container-shutdown and tripleo-start-podman-container"
|
||||||
|
|
Loading…
Reference in New Issue