summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-09-04 20:59:11 +0000
committerGerrit Code Review <review@openstack.org>2017-09-04 20:59:11 +0000
commit03a02fdbd6dba270ad0d008b08ef0c14743ef7a5 (patch)
tree304c0940103b3b443a9853982965ac53b73cf98e /docker
parentec4f70f24651b90c75477812690eaf3fbbfdcd55 (diff)
parent39927f531854dcef0d15d60ff67afd7a3d2545dc (diff)
Merge "Stop hardcoding host's config volume path" into stable/pike
Diffstat (limited to 'docker')
-rwxr-xr-xdocker/docker-puppet.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/docker-puppet.py b/docker/docker-puppet.py
index 4659cf53..613adf10 100755
--- a/docker/docker-puppet.py
+++ b/docker/docker-puppet.py
@@ -257,7 +257,7 @@ def mp_puppet_config((config_volume, puppet_tags, manifest, config_image, volume
'--volume', '%s:/etc/config.pp:ro' % tmp_man.name,
'--volume', '/etc/puppet/:/tmp/puppet-etc/:ro',
'--volume', '/usr/share/openstack-puppet/modules/:/usr/share/openstack-puppet/modules/:ro',
- '--volume', '/var/lib/config-data/:/var/lib/config-data/:rw',
+ '--volume', '%s:/var/lib/config-data/:rw' % os.environ.get('CONFIG_VOLUME_PREFIX', '/var/lib/config-data'),
'--volume', 'tripleo_logs:/var/log/tripleo/',
# Syslog socket for puppet logs
'--volume', '/dev/log:/dev/log',