From 2c0ebe8c605908a9b91c3f58560b2bbb97f5975b Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Thu, 22 Jul 2021 11:24:57 +0200 Subject: [PATCH] Drop tripleo_container_manage_systemd_order variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Via Ief0729e51997c3eb1dba679cc40ce7bbf4702bc3 "Adjust shutdown service management" we dropped support for tripleo_container_manage_systemd_order let's just remove its use entirely. Depends-On: I6fb00e27f8d18ff42f214e5045301c3334d14277↲ Change-Id: Icc93a5f2d05ef79ff81748435d385cb83b469d4b --- doc/source/roles/role-tripleo_container_manage.rst | 5 ----- .../roles/tripleo_container_manage/defaults/main.yml | 1 - .../tripleo_container_manage/molecule/default/converge.yml | 7 ------- 3 files changed, 13 deletions(-) diff --git a/doc/source/roles/role-tripleo_container_manage.rst b/doc/source/roles/role-tripleo_container_manage.rst index b7729bce7..045a126a6 100644 --- a/doc/source/roles/role-tripleo_container_manage.rst +++ b/doc/source/roles/role-tripleo_container_manage.rst @@ -77,7 +77,6 @@ This Ansible role allows to do the following tasks: include_role: name: tripleo_container_manage vars: - tripleo_container_manage_systemd_order: true tripleo_container_manage_config: "/var/lib/tripleo-config/container-startup-config/step_1" tripleo_container_manage_config_id: "tripleo_step1" @@ -105,9 +104,6 @@ Roles variables +------------------------------------------------+-----------------------------+----------------------------+ | tripleo_container_manage_log_path | /var/log/containers/stdouts | Containers stdouts path | +------------------------------------------------+-----------------------------+----------------------------+ -| tripleo_container_manage_systemd_order | false | Manage systemd shutdown | -| | | ordering | -+------------------------------------------------+-----------------------------+----------------------------+ | tripleo_container_manage_config_overrides | {} | Allows to override any | | | | container configuration | +------------------------------------------------+-----------------------------+----------------------------+ @@ -186,7 +182,6 @@ overrides the image setting in one-off. include_role: name: tripleo_container_manage vars: - tripleo_container_manage_systemd_order: true tripleo_container_manage_config_patterns: 'haproxy.json' tripleo_container_manage_config: "/var/lib/tripleo-config/container-startup-config/step_1" tripleo_container_manage_config_id: "tripleo_step1" diff --git a/tripleo_ansible/roles/tripleo_container_manage/defaults/main.yml b/tripleo_ansible/roles/tripleo_container_manage/defaults/main.yml index 20c460430..295f0a9a6 100644 --- a/tripleo_ansible/roles/tripleo_container_manage/defaults/main.yml +++ b/tripleo_ansible/roles/tripleo_container_manage/defaults/main.yml @@ -36,6 +36,5 @@ tripleo_container_manage_create_retries: 120 tripleo_container_manage_exec_retries: 120 tripleo_container_manage_healthcheck_disabled: false tripleo_container_manage_log_path: '/var/log/containers/stdouts' -tripleo_container_manage_systemd_order: false tripleo_container_manage_systemd_teardown: true tripleo_container_manage_valid_exit_code: [] diff --git a/tripleo_ansible/roles/tripleo_container_manage/molecule/default/converge.yml b/tripleo_ansible/roles/tripleo_container_manage/molecule/default/converge.yml index a7a3a9874..cf1fdb321 100644 --- a/tripleo_ansible/roles/tripleo_container_manage/molecule/default/converge.yml +++ b/tripleo_ansible/roles/tripleo_container_manage/molecule/default/converge.yml @@ -24,7 +24,6 @@ tripleo_container_manage_healthcheck_disabled: true tripleo_container_manage_debug: true tripleo_container_manage_config_patterns: 'fedora.json' - tripleo_container_manage_systemd_order: true tasks: - include_role: name: tripleo_container_manage @@ -63,7 +62,6 @@ tripleo_container_manage_config: '/tmp/container-configs' tripleo_container_manage_debug: true tripleo_container_manage_config_patterns: '*.json' - tripleo_container_manage_systemd_order: true tripleo_container_manage_valid_exit_code: [0] tasks: - include_role: @@ -142,7 +140,6 @@ tripleo_container_manage_config: '/tmp/container-configs' tripleo_container_manage_debug: true tripleo_container_manage_config_patterns: '*.json' - tripleo_container_manage_systemd_order: true tasks: - name: Gather facts about fedora container before new run containers.podman.podman_container_info: @@ -176,7 +173,6 @@ tripleo_container_manage_config: '/tmp/container-configs' tripleo_container_manage_debug: true tripleo_container_manage_config_patterns: '*.json' - tripleo_container_manage_systemd_order: true tasks: - name: Stop systemd service for tripleo_fedora in a manual stop systemd: @@ -302,7 +298,6 @@ tripleo_container_manage_config: '/tmp/container-configs' tripleo_container_manage_debug: true tripleo_container_manage_config_patterns: 'fedora_*.json' - tripleo_container_manage_systemd_order: true tasks: - name: Remove fedora container config file: @@ -336,7 +331,6 @@ tripleo_container_manage_config: '/tmp/container-configs' tripleo_container_manage_debug: true tripleo_container_manage_config_patterns: 'fedora_*.json' - tripleo_container_manage_systemd_order: true tasks: - name: Modify the fedora_bis container config copy: @@ -379,7 +373,6 @@ tripleo_container_manage_config: '/tmp/container-configs' tripleo_container_manage_debug: true tripleo_container_manage_config_patterns: 'fedora_*.json' - tripleo_container_manage_systemd_order: true tripleo_container_manage_config_overrides: fedora_bis: image: fedora:latest