From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 4 Sep 2017 20:59:11 +0000 (+0000)
Subject: Merge "Stop hardcoding host's config volume path" into stable/pike
X-Git-Tag: opnfv-6.0.0~152
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=03a02fdbd6dba270ad0d008b08ef0c14743ef7a5;hp=ec4f70f24651b90c75477812690eaf3fbbfdcd55;p=apex-tripleo-heat-templates.git

Merge "Stop hardcoding host's config volume path" into stable/pike
---

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',