summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorMartin André <m.andre@redhat.com>2017-08-16 12:41:41 +0200
committerEmilien Macchi <emilien@redhat.com>2017-09-04 15:57:44 +0000
commit39927f531854dcef0d15d60ff67afd7a3d2545dc (patch)
tree50476188c3bf71a7a19f2e0a1c4111ecc223f128 /docker
parent6a807313c33119b65d11b923323e0d0e73436350 (diff)
Stop hardcoding host's config volume path
Get the path from the CONFIG_VOLUME_PREFIX environment variable. This is useful for debugging and generate configuration files to a different directory. Change-Id: Ib85e3898804312ebb6677a5fa189fbfc357ce27c (cherry picked from commit 0c62b6cd8d696befb1c0c31bb6e206199ce1edac)
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',