openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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 <michele@acksyn.org>
Change-Id: I980dfc54b799c6b1d648489a727a590dd26fa502
Closes-Bug: 1918642
(cherry picked from commit c8a828aab2)
(cherry picked from commit a6c7ba02a9)
This commit is contained in:
Giulio Fidente 2021-03-11 11:48:00 +01:00
parent a1b22c7322
commit 33b47f4792
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/glance/glance-api-container-puppet.yaml
View File

@ -664,7 +664,7 @@ outputs:
- if: - if:
- internal_tls_enabled - internal_tls_enabled
- glance_api_tls_proxy: - glance_api_tls_proxy:
start_order: 2 start_order: 3
image: *glance_api_image image: *glance_api_image
net: host net: host
user: root user: root

1
deployment/swift/swift-proxy-container-puppet.yaml
View File

@ -419,6 +419,7 @@ outputs:
- if: - if:
- internal_tls_enabled - internal_tls_enabled
- swift_proxy_tls_proxy: - swift_proxy_tls_proxy:
start_order: 3
image: *swift_proxy_image image: *swift_proxy_image
net: host net: host
user: root user: root