From 76421eb249051c749c920e600d9caa508d9e7729 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Thu, 20 Jul 2017 15:04:10 +0100 Subject: [PATCH] Move deploy-steps-playbook to deploy-steps-tasks So that we can more easily iterate over an include in an output Change-Id: Idd5bb47589e5c37123caafcded1afbff8881aa33 --- ...loy-steps-playbook.yaml => deploy-steps-tasks.yaml} | 6 +++--- common/deploy-steps.j2 | 10 +++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) rename common/{deploy-steps-playbook.yaml => deploy-steps-tasks.yaml} (97%) diff --git a/common/deploy-steps-playbook.yaml b/common/deploy-steps-tasks.yaml similarity index 97% rename from common/deploy-steps-playbook.yaml rename to common/deploy-steps-tasks.yaml index b884e0e7a2..c6935e75f1 100644 --- a/common/deploy-steps-playbook.yaml +++ b/common/deploy-steps-tasks.yaml @@ -1,6 +1,6 @@ -- hosts: localhost - connection: local - tasks: + # Note the indentation here is required as it's joined + # to create a playbook in deploy-steps.j2 + ##################################################### # Per step puppet configuration of the baremetal host ##################################################### diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2 index e5d7e98c91..bd8d9bc0b0 100644 --- a/common/deploy-steps.j2 +++ b/common/deploy-steps.j2 @@ -72,7 +72,15 @@ resources: - name: update_identifier - name: bootstrap_server_id - name: docker_puppet_debug - config: {get_file: deploy-steps-playbook.yaml} + config: + str_replace: + template: | + - hosts: localhost + connection: local + tasks: + _TASKS + params: + _TASKS: {get_file: deploy-steps-tasks.yaml} {%- for step in range(1, deploy_steps_max) %} # BEGIN service_workflow_tasks handling