summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-08-03 06:46:16 +0000
committerGerrit Code Review <review@openstack.org>2017-08-03 06:46:16 +0000
commit2cf0a6843a1df7fb4386c96c7e782609a52e98e3 (patch)
treeb6e2ac36dd198dbefd0950a0cfe24bee047070d0
parent39a6e47109131c19d756fbeacff9dd979de8f012 (diff)
parent7fb7ed7a8422b3f01d1d9cc5df04852262e8ee8f (diff)
Merge "Fix CA file bind mounting in containers"
-rw-r--r--docker/services/containers-common.yaml6
1 files changed, 5 insertions, 1 deletions
diff --git a/docker/services/containers-common.yaml b/docker/services/containers-common.yaml
index 71ea8d1f..2c894da5 100644
--- a/docker/services/containers-common.yaml
+++ b/docker/services/containers-common.yaml
@@ -66,5 +66,9 @@ outputs:
- /etc/ssh/ssh_known_hosts:/etc/ssh/ssh_known_hosts:ro
- if:
- internal_tls_enabled
- - - {get_param: InternalTLSCAFile}
+ - - list_join:
+ - ':'
+ - - {get_param: InternalTLSCAFile}
+ - {get_param: InternalTLSCAFile}
+ - 'ro'
- null