From 33b47f47926f504a1799c7de60ae88e489c1f455 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Thu, 11 Mar 2021 11:48:00 +0100 Subject: [PATCH] Fix start order for {swift_proxy,glance_api}_tls_proxy In stack updates adding TLS to Swift would not work because swift_proxy_tls_proxy is started when the pre-existing swift_proxy container is still up and listening on the TCP port which should instead be used by swift_proxy_tls_proxy This change ensures swift_proxy_tls_proxy and glance_api_tls_proxy containers are started after the actual swift_proxy and glance_api containers are started. Co-Authored-By: Michele Baldessari Change-Id: I980dfc54b799c6b1d648489a727a590dd26fa502 Closes-Bug: 1918642 (cherry picked from commit c8a828aab297500176d2f9e9e0b05d47d60e4645) (cherry picked from commit a6c7ba02a969fa82473b2f670b1e8d98baf70b59) --- deployment/glance/glance-api-container-puppet.yaml | 2 +- deployment/swift/swift-proxy-container-puppet.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml index e1485fc2ec..c8547d3424 100644 --- a/deployment/glance/glance-api-container-puppet.yaml +++ b/deployment/glance/glance-api-container-puppet.yaml @@ -664,7 +664,7 @@ outputs: - if: - internal_tls_enabled - glance_api_tls_proxy: - start_order: 2 + start_order: 3 image: *glance_api_image net: host user: root diff --git a/deployment/swift/swift-proxy-container-puppet.yaml b/deployment/swift/swift-proxy-container-puppet.yaml index 26b91cafab..5e8a556c62 100644 --- a/deployment/swift/swift-proxy-container-puppet.yaml +++ b/deployment/swift/swift-proxy-container-puppet.yaml @@ -419,6 +419,7 @@ outputs: - if: - internal_tls_enabled - swift_proxy_tls_proxy: + start_order: 3 image: *swift_proxy_image net: host user: root