diff options
| author |   Dan Prince <dprince@redhat.com> | 2017-02-23 14:42:19 -0500 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2017-02-23 14:45:47 -0500 |
| commit | f09f50f96ae5978e71c6bc42bb6a6a9652649851 (patch) | |
| tree | b175ef45b16334f9183b954a29feb32eac1c0924 /docker/docker-puppet.py | |
| parent | 571e67c1361bbeff7b79bdc3ba75b4c8b0c508af (diff) | |
Add step to docker_puppet_tasks
This patch sets the step correctly for docker_puppet_tasks.
This is now required in order to match the 'step' in some
puppet manifests explicitly so that things like keystone
initialization run correctly.
Closes-bug: #1667454
Change-Id: If2bdd0b1051125674f116f895832b48723d82b3a
Diffstat (limited to 'docker/docker-puppet.py')
| -rwxr-xr-x | docker/docker-puppet.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/docker/docker-puppet.py b/docker/docker-puppet.py index a642e848..1bb8bc2b 100755 --- a/docker/docker-puppet.py +++ b/docker/docker-puppet.py @@ -127,7 +127,7 @@ def mp_puppet_config((config_volume, puppet_tags, manifest, config_image, volume mkdir -p /etc/puppet cp -a /tmp/puppet-etc/* /etc/puppet rm -Rf /etc/puppet/ssl # not in use and causes permission errors - echo '{"step": 6}' > /etc/puppet/hieradata/docker.json + echo '{"step": %(step)s}' > /etc/puppet/hieradata/docker.json TAGS="" if [ -n "%(puppet_tags)s" ]; then TAGS='--tags "%(puppet_tags)s"' @@ -162,7 +162,8 @@ def mp_puppet_config((config_volume, puppet_tags, manifest, config_image, volume fi """ % {'puppet_tags': puppet_tags, 'name': config_volume, 'hostname': hostname, - 'no_archive': os.environ.get('NO_ARCHIVE', '')}) + 'no_archive': os.environ.get('NO_ARCHIVE', ''), + 'step': os.environ.get('STEP', '6')}) with tempfile.NamedTemporaryFile() as tmp_man: with open(tmp_man.name, 'w') as man_file: |