From f09f50f96ae5978e71c6bc42bb6a6a9652649851 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Thu, 23 Feb 2017 14:42:19 -0500 Subject: 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 --- docker/docker-puppet.py | 5 +++-- docker/post.j2.yaml | 2 ++ docker/services/keystone.yaml | 2 +- 3 files changed, 6 insertions(+), 3 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: diff --git a/docker/post.j2.yaml b/docker/post.j2.yaml index 3473f4ca..e1154a62 100644 --- a/docker/post.j2.yaml +++ b/docker/post.j2.yaml @@ -68,6 +68,7 @@ resources: - name: CONFIG - name: NET_HOST - name: NO_ARCHIVE + - name: STEP {{primary_role_name}}DockerPuppetTasksDeployment{{step}}: type: OS::Heat::SoftwareDeployment @@ -85,6 +86,7 @@ resources: CONFIG: /var/lib/docker-puppet/docker-puppet-tasks{{step}}.json NET_HOST: 'true' NO_ARCHIVE: 'true' + STEP: {{step}} {% endfor %} # END primary_role_name docker-puppet-tasks diff --git a/docker/services/keystone.yaml b/docker/services/keystone.yaml index 1d25da72..2bf8fa09 100644 --- a/docker/services/keystone.yaml +++ b/docker/services/keystone.yaml @@ -144,7 +144,7 @@ outputs: [ 'keystone', 'keystone-manage', 'bootstrap', '--bootstrap-password', {get_param: AdminPassword} ] docker_puppet_tasks: # Keystone endpoint creation occurs only on single node - step_4: + step_3: - 'keystone_init_tasks' - 'keystone_config,keystone_domain_config,keystone_endpoint,keystone_identity_provider,keystone_paste_ini,keystone_role,keystone_service,keystone_tenant,keystone_user,keystone_user_role,keystone_domain' - 'include ::tripleo::profile::base::keystone' -- cgit 1.2.3-korg