From be04d6fa9a453f9f07d663f2a54d3a8d68d2812f Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Thu, 22 Jul 2021 11:27:13 +0200 Subject: [PATCH] Stop using tripleo_container_manage_systemd_order Via Ief0729e51997c3eb1dba679cc40ce7bbf4702bc3 "Adjust shutdown service management" we dropped support for tripleo_container_manage_systemd_order let's just remove its use in THT before we remove all traces of it in tripleo-ansible (via Icc93a5f2d05ef79ff81748435d385cb83b469d4b). Change-Id: I6fb00e27f8d18ff42f214e5045301c3334d14277 --- common/deploy-steps-tasks.yaml | 1 - deployment/frr/frr-container-ansible.yaml | 1 - deployment/ovn/ovn-dbs-cluster-ansible.yaml | 1 - 3 files changed, 3 deletions(-) diff --git a/common/deploy-steps-tasks.yaml b/common/deploy-steps-tasks.yaml index 9c3a6df157..ae36dcd5ea 100644 --- a/common/deploy-steps-tasks.yaml +++ b/common/deploy-steps-tasks.yaml @@ -100,7 +100,6 @@ name: tripleo_container_manage vars: tripleo_container_manage_concurrency: 5 - tripleo_container_manage_systemd_order: true tripleo_container_manage_cli: "{{ container_cli }}" tripleo_container_manage_config: "/var/lib/tripleo-config/container-startup-config/step_{{ step }}" tripleo_container_manage_config_id: "tripleo_step{{ step }}" diff --git a/deployment/frr/frr-container-ansible.yaml b/deployment/frr/frr-container-ansible.yaml index 7b07ca83ae..cbe00ee876 100644 --- a/deployment/frr/frr-container-ansible.yaml +++ b/deployment/frr/frr-container-ansible.yaml @@ -224,7 +224,6 @@ outputs: tripleo_container_manage_config: "/var/lib/tripleo-config/container-startup-config/step_0" tripleo_container_manage_config_id: "frr" tripleo_container_manage_config_patterns: "frr.json" - tripleo_container_manage_systemd_order: true tripleo_container_manage_clean_orphans: false update_tasks: [] upgrade_tasks: [] diff --git a/deployment/ovn/ovn-dbs-cluster-ansible.yaml b/deployment/ovn/ovn-dbs-cluster-ansible.yaml index 68a2e4cd64..053f2b9280 100644 --- a/deployment/ovn/ovn-dbs-cluster-ansible.yaml +++ b/deployment/ovn/ovn-dbs-cluster-ansible.yaml @@ -280,7 +280,6 @@ outputs: tripleo_container_manage_config: "/var/lib/tripleo-config/container-startup-config/step_0" tripleo_container_manage_config_id: "{{ ovn_container }}" tripleo_container_manage_config_patterns: "{{ ovn_container }}.json" - tripleo_container_manage_systemd_order: true loop: - ovn_cluster_north_db_server - ovn_cluster_south_db_server