aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-12 14:18:50 +0000
committerGerrit Code Review <review@openstack.org>2017-04-12 14:18:50 +0000
commit9584d5955c343e471a126ae1a158d2369a491f3f (patch)
tree47b4e74c9e8ccb7b170e90944b713a098194a6f5
parentcec6d0d3dd547c40d66bbc594d7cd7ae037c6214 (diff)
parent39f63c5efa2dd2eef139ac7719ded18f7fd8b94c (diff)
Merge "docker/all: Bind-mount OpenSSL CA bundle"
-rwxr-xr-xdocker/docker-puppet.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/docker/docker-puppet.py b/docker/docker-puppet.py
index c364d039..5c68b08d 100755
--- a/docker/docker-puppet.py
+++ b/docker/docker-puppet.py
@@ -202,6 +202,12 @@ def mp_puppet_config((config_volume, puppet_tags, manifest, config_image, volume
'--volume', '/usr/share/openstack-puppet/modules/:/usr/share/openstack-puppet/modules/:ro',
'--volume', '/var/lib/config-data/:/var/lib/config-data/:rw',
'--volume', 'tripleo_logs:/var/log/tripleo/',
+ # OpenSSL trusted CA injection
+ '--volume', '/etc/pki/ca-trust/extracted:/etc/pki/ca-trust/extracted:ro',
+ '--volume', '/etc/pki/tls/certs/ca-bundle.crt:/etc/pki/tls/certs/ca-bundle.crt:ro',
+ '--volume', '/etc/pki/tls/certs/ca-bundle.trust.crt:/etc/pki/tls/certs/ca-bundle.trust.crt:ro',
+ '--volume', '/etc/pki/tls/cert.pem:/etc/pki/tls/cert.pem:ro',
+ # script injection
'--volume', '%s:%s:rw' % (sh_script, sh_script) ]
for volume in volumes: