From 7e8ffdcd261a8c8bb2efda6847aeb4080b2b7e05 Mon Sep 17 00:00:00 2001 From: rabi Date: Fri, 6 Sep 2024 15:03:20 +0530 Subject: [PATCH] Remove start_order from container configs They have no relevance atm as containers are started individually with edpm_container_manage/edpm_container_standalone. --- roles/edpm_frr/templates/frr.yaml.j2 | 1 - roles/edpm_neutron_dhcp/templates/neutron_dhcp_agent.yaml.j2 | 1 - roles/edpm_neutron_metadata/templates/ovn_metadata_agent.yaml.j2 | 1 - roles/edpm_neutron_ovn/templates/ovn_agent.yaml.j2 | 1 - roles/edpm_neutron_sriov/templates/neutron_sriov_agent.yaml.j2 | 1 - roles/edpm_ovn/templates/ovn_controller.yaml.j2 | 1 - roles/edpm_ovn_bgp_agent/templates/bgp_ovn_controller.yaml.j2 | 1 - roles/edpm_ovn_bgp_agent/templates/nb_db_server.yaml.j2 | 1 - roles/edpm_ovn_bgp_agent/templates/northd.yaml.j2 | 1 - roles/edpm_ovn_bgp_agent/templates/ovn_bgp_agent.yaml.j2 | 1 - roles/edpm_ovn_bgp_agent/templates/sb_db_server.yaml.j2 | 1 - roles/edpm_swift/templates/rsync.yaml.j2 | 1 - roles/edpm_swift/templates/swift_account_auditor.yaml.j2 | 1 - roles/edpm_swift/templates/swift_account_reaper.yaml.j2 | 1 - roles/edpm_swift/templates/swift_account_replicator.yaml.j2 | 1 - roles/edpm_swift/templates/swift_account_server.yaml.j2 | 1 - roles/edpm_swift/templates/swift_container_auditor.yaml.j2 | 1 - roles/edpm_swift/templates/swift_container_replicator.yaml.j2 | 1 - roles/edpm_swift/templates/swift_container_server.yaml.j2 | 1 - roles/edpm_swift/templates/swift_container_updater.yaml.j2 | 1 - roles/edpm_swift/templates/swift_object_auditor.yaml.j2 | 1 - roles/edpm_swift/templates/swift_object_expirer.yaml.j2 | 1 - roles/edpm_swift/templates/swift_object_replicator.yaml.j2 | 1 - roles/edpm_swift/templates/swift_object_server.yaml.j2 | 1 - roles/edpm_swift/templates/swift_object_updater.yaml.j2 | 1 - 25 files changed, 25 deletions(-) diff --git a/roles/edpm_frr/templates/frr.yaml.j2 b/roles/edpm_frr/templates/frr.yaml.j2 index e580a73ce..203ba5869 100644 --- a/roles/edpm_frr/templates/frr.yaml.j2 +++ b/roles/edpm_frr/templates/frr.yaml.j2 @@ -1,4 +1,3 @@ -start_order: 0 image: "{{ edpm_frr_image }}" net: host privileged: false diff --git a/roles/edpm_neutron_dhcp/templates/neutron_dhcp_agent.yaml.j2 b/roles/edpm_neutron_dhcp/templates/neutron_dhcp_agent.yaml.j2 index f652b4a4e..d4f8424c1 100644 --- a/roles/edpm_neutron_dhcp/templates/neutron_dhcp_agent.yaml.j2 +++ b/roles/edpm_neutron_dhcp/templates/neutron_dhcp_agent.yaml.j2 @@ -1,4 +1,3 @@ -start_order: 1 image: "{{ edpm_neutron_dhcp_image }}" net: host pid: host diff --git a/roles/edpm_neutron_metadata/templates/ovn_metadata_agent.yaml.j2 b/roles/edpm_neutron_metadata/templates/ovn_metadata_agent.yaml.j2 index 7b88f272f..6a190f7a0 100644 --- a/roles/edpm_neutron_metadata/templates/ovn_metadata_agent.yaml.j2 +++ b/roles/edpm_neutron_metadata/templates/ovn_metadata_agent.yaml.j2 @@ -7,7 +7,6 @@ edpm_neutron_metadata_volumes + edpm_neutron_metadata_tls_volumes %} {%- endif -%} -start_order: 2 image: "{{ edpm_neutron_metadata_agent_image }}" net: host pid: host diff --git a/roles/edpm_neutron_ovn/templates/ovn_agent.yaml.j2 b/roles/edpm_neutron_ovn/templates/ovn_agent.yaml.j2 index 6dc0584c6..f0e0568bf 100644 --- a/roles/edpm_neutron_ovn/templates/ovn_agent.yaml.j2 +++ b/roles/edpm_neutron_ovn/templates/ovn_agent.yaml.j2 @@ -1,4 +1,3 @@ -start_order: 2 image: "{{ edpm_neutron_ovn_agent_image }}" net: host privileged: true diff --git a/roles/edpm_neutron_sriov/templates/neutron_sriov_agent.yaml.j2 b/roles/edpm_neutron_sriov/templates/neutron_sriov_agent.yaml.j2 index 24ccd7383..d447b4b92 100644 --- a/roles/edpm_neutron_sriov/templates/neutron_sriov_agent.yaml.j2 +++ b/roles/edpm_neutron_sriov/templates/neutron_sriov_agent.yaml.j2 @@ -1,4 +1,3 @@ -start_order: 1 image: "{{ edpm_neutron_sriov_image }}" net: host privileged: true diff --git a/roles/edpm_ovn/templates/ovn_controller.yaml.j2 b/roles/edpm_ovn/templates/ovn_controller.yaml.j2 index 1f7bf8f71..30ed00f49 100644 --- a/roles/edpm_ovn/templates/ovn_controller.yaml.j2 +++ b/roles/edpm_ovn/templates/ovn_controller.yaml.j2 @@ -7,7 +7,6 @@ edpm_ovn_controller_volumes + edpm_ovn_controller_tls_volumes %} {%- endif -%} -start_order: 1 image: "{{ edpm_ovn_controller_agent_image }}" net: host privileged: true diff --git a/roles/edpm_ovn_bgp_agent/templates/bgp_ovn_controller.yaml.j2 b/roles/edpm_ovn_bgp_agent/templates/bgp_ovn_controller.yaml.j2 index b2d4e8c64..0bbb809a6 100644 --- a/roles/edpm_ovn_bgp_agent/templates/bgp_ovn_controller.yaml.j2 +++ b/roles/edpm_ovn_bgp_agent/templates/bgp_ovn_controller.yaml.j2 @@ -8,7 +8,6 @@ edpm_ovn_bgp_agent_local_ovn_cluster_volumes + edpm_ovn_bgp_agent_local_ovn_cluster_tls_volumes %} {%- endif -%} -start_order: 1 image: "{{ edpm_ovn_bgp_agent_local_ovn_controller_image }}" net: host privileged: true diff --git a/roles/edpm_ovn_bgp_agent/templates/nb_db_server.yaml.j2 b/roles/edpm_ovn_bgp_agent/templates/nb_db_server.yaml.j2 index 11b9ebfb2..29daca186 100644 --- a/roles/edpm_ovn_bgp_agent/templates/nb_db_server.yaml.j2 +++ b/roles/edpm_ovn_bgp_agent/templates/nb_db_server.yaml.j2 @@ -8,7 +8,6 @@ edpm_ovn_bgp_agent_local_ovn_cluster_volumes + edpm_ovn_bgp_agent_local_ovn_cluster_tls_volumes %} {%- endif -%} -start_order: 1 image: "{{ edpm_ovn_bgp_agent_local_ovn_nb_db_image }}" net: host privileged: true diff --git a/roles/edpm_ovn_bgp_agent/templates/northd.yaml.j2 b/roles/edpm_ovn_bgp_agent/templates/northd.yaml.j2 index 4611c5373..92e5eaa96 100644 --- a/roles/edpm_ovn_bgp_agent/templates/northd.yaml.j2 +++ b/roles/edpm_ovn_bgp_agent/templates/northd.yaml.j2 @@ -8,7 +8,6 @@ edpm_ovn_bgp_agent_local_ovn_cluster_volumes + edpm_ovn_bgp_agent_local_ovn_cluster_tls_volumes %} {%- endif -%} -start_order: 1 image: "{{ edpm_ovn_bgp_agent_local_ovn_northd_image }}" net: host privileged: true diff --git a/roles/edpm_ovn_bgp_agent/templates/ovn_bgp_agent.yaml.j2 b/roles/edpm_ovn_bgp_agent/templates/ovn_bgp_agent.yaml.j2 index 61d7694de..279e63f9e 100644 --- a/roles/edpm_ovn_bgp_agent/templates/ovn_bgp_agent.yaml.j2 +++ b/roles/edpm_ovn_bgp_agent/templates/ovn_bgp_agent.yaml.j2 @@ -17,7 +17,6 @@ edpm_ovn_bgp_agent_local_ovn_cluster_common_volumes %} {%- endif %} {%- endif -%} -start_order: 0 image: "{{ edpm_ovn_bgp_agent_image }}" net: host privileged: true diff --git a/roles/edpm_ovn_bgp_agent/templates/sb_db_server.yaml.j2 b/roles/edpm_ovn_bgp_agent/templates/sb_db_server.yaml.j2 index c87ded800..bf472d6b7 100644 --- a/roles/edpm_ovn_bgp_agent/templates/sb_db_server.yaml.j2 +++ b/roles/edpm_ovn_bgp_agent/templates/sb_db_server.yaml.j2 @@ -8,7 +8,6 @@ edpm_ovn_bgp_agent_local_ovn_cluster_volumes + edpm_ovn_bgp_agent_local_ovn_cluster_tls_volumes %} {%- endif -%} -start_order: 1 image: "{{ edpm_ovn_bgp_agent_local_ovn_sb_db_image }}" net: host privileged: true diff --git a/roles/edpm_swift/templates/rsync.yaml.j2 b/roles/edpm_swift/templates/rsync.yaml.j2 index 9c3de18a2..2ab20cb2c 100644 --- a/roles/edpm_swift/templates/rsync.yaml.j2 +++ b/roles/edpm_swift/templates/rsync.yaml.j2 @@ -1,4 +1,3 @@ -start_order: 1 image: "{{ edpm_swift_object_image }}" net: host pid: host diff --git a/roles/edpm_swift/templates/swift_account_auditor.yaml.j2 b/roles/edpm_swift/templates/swift_account_auditor.yaml.j2 index 4065dd005..27e92bbd0 100644 --- a/roles/edpm_swift/templates/swift_account_auditor.yaml.j2 +++ b/roles/edpm_swift/templates/swift_account_auditor.yaml.j2 @@ -1,4 +1,3 @@ -start_order: 1 image: "{{ edpm_swift_account_image }}" net: host pid: host diff --git a/roles/edpm_swift/templates/swift_account_reaper.yaml.j2 b/roles/edpm_swift/templates/swift_account_reaper.yaml.j2 index ea97dbfe7..c55e64b4d 100644 --- a/roles/edpm_swift/templates/swift_account_reaper.yaml.j2 +++ b/roles/edpm_swift/templates/swift_account_reaper.yaml.j2 @@ -1,4 +1,3 @@ -start_order: 1 image: "{{ edpm_swift_account_image }}" net: host pid: host diff --git a/roles/edpm_swift/templates/swift_account_replicator.yaml.j2 b/roles/edpm_swift/templates/swift_account_replicator.yaml.j2 index 78c4f7565..7f3ee6b87 100644 --- a/roles/edpm_swift/templates/swift_account_replicator.yaml.j2 +++ b/roles/edpm_swift/templates/swift_account_replicator.yaml.j2 @@ -1,4 +1,3 @@ -start_order: 1 image: "{{ edpm_swift_account_image }}" net: host pid: host diff --git a/roles/edpm_swift/templates/swift_account_server.yaml.j2 b/roles/edpm_swift/templates/swift_account_server.yaml.j2 index 065aa3227..da5f1c60e 100644 --- a/roles/edpm_swift/templates/swift_account_server.yaml.j2 +++ b/roles/edpm_swift/templates/swift_account_server.yaml.j2 @@ -1,4 +1,3 @@ -start_order: 1 image: "{{ edpm_swift_account_image }}" net: host pid: host diff --git a/roles/edpm_swift/templates/swift_container_auditor.yaml.j2 b/roles/edpm_swift/templates/swift_container_auditor.yaml.j2 index 3323b313f..9d1b9ffa0 100644 --- a/roles/edpm_swift/templates/swift_container_auditor.yaml.j2 +++ b/roles/edpm_swift/templates/swift_container_auditor.yaml.j2 @@ -1,4 +1,3 @@ -start_order: 1 image: "{{ edpm_swift_container_image }}" net: host pid: host diff --git a/roles/edpm_swift/templates/swift_container_replicator.yaml.j2 b/roles/edpm_swift/templates/swift_container_replicator.yaml.j2 index 5b5affb62..b543e0c49 100644 --- a/roles/edpm_swift/templates/swift_container_replicator.yaml.j2 +++ b/roles/edpm_swift/templates/swift_container_replicator.yaml.j2 @@ -1,4 +1,3 @@ -start_order: 1 image: "{{ edpm_swift_container_image }}" net: host pid: host diff --git a/roles/edpm_swift/templates/swift_container_server.yaml.j2 b/roles/edpm_swift/templates/swift_container_server.yaml.j2 index 799d8fabd..1f4f86ecb 100644 --- a/roles/edpm_swift/templates/swift_container_server.yaml.j2 +++ b/roles/edpm_swift/templates/swift_container_server.yaml.j2 @@ -1,4 +1,3 @@ -start_order: 1 image: "{{ edpm_swift_container_image }}" net: host pid: host diff --git a/roles/edpm_swift/templates/swift_container_updater.yaml.j2 b/roles/edpm_swift/templates/swift_container_updater.yaml.j2 index cda67d30e..fbbb8765f 100644 --- a/roles/edpm_swift/templates/swift_container_updater.yaml.j2 +++ b/roles/edpm_swift/templates/swift_container_updater.yaml.j2 @@ -1,4 +1,3 @@ -start_order: 1 image: "{{ edpm_swift_container_image }}" net: host pid: host diff --git a/roles/edpm_swift/templates/swift_object_auditor.yaml.j2 b/roles/edpm_swift/templates/swift_object_auditor.yaml.j2 index c1f6425e1..42db2fad8 100644 --- a/roles/edpm_swift/templates/swift_object_auditor.yaml.j2 +++ b/roles/edpm_swift/templates/swift_object_auditor.yaml.j2 @@ -1,4 +1,3 @@ -start_order: 1 image: "{{ edpm_swift_object_image }}" net: host pid: host diff --git a/roles/edpm_swift/templates/swift_object_expirer.yaml.j2 b/roles/edpm_swift/templates/swift_object_expirer.yaml.j2 index 0673d5ffe..a38d43b91 100644 --- a/roles/edpm_swift/templates/swift_object_expirer.yaml.j2 +++ b/roles/edpm_swift/templates/swift_object_expirer.yaml.j2 @@ -1,4 +1,3 @@ -start_order: 1 image: "{{ edpm_swift_proxy_image }}" net: host pid: host diff --git a/roles/edpm_swift/templates/swift_object_replicator.yaml.j2 b/roles/edpm_swift/templates/swift_object_replicator.yaml.j2 index 149caaa8f..7e97bc583 100644 --- a/roles/edpm_swift/templates/swift_object_replicator.yaml.j2 +++ b/roles/edpm_swift/templates/swift_object_replicator.yaml.j2 @@ -1,4 +1,3 @@ -start_order: 1 image: "{{ edpm_swift_object_image }}" net: host pid: host diff --git a/roles/edpm_swift/templates/swift_object_server.yaml.j2 b/roles/edpm_swift/templates/swift_object_server.yaml.j2 index 26a82af6e..998a20e37 100644 --- a/roles/edpm_swift/templates/swift_object_server.yaml.j2 +++ b/roles/edpm_swift/templates/swift_object_server.yaml.j2 @@ -1,4 +1,3 @@ -start_order: 1 image: "{{ edpm_swift_object_image }}" net: host pid: host diff --git a/roles/edpm_swift/templates/swift_object_updater.yaml.j2 b/roles/edpm_swift/templates/swift_object_updater.yaml.j2 index 862b480fc..d787a5243 100644 --- a/roles/edpm_swift/templates/swift_object_updater.yaml.j2 +++ b/roles/edpm_swift/templates/swift_object_updater.yaml.j2 @@ -1,4 +1,3 @@ -start_order: 1 image: "{{ edpm_swift_object_image }}" net: host pid: host