From: Steven Hardy <shardy@redhat.com>
Date: Thu, 20 Jul 2017 14:04:10 +0000 (+0100)
Subject: Move deploy-steps-playbook to deploy-steps-tasks
X-Git-Tag: opnfv-6.0.0~270^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=76421eb249051c749c920e600d9caa508d9e7729;p=apex-tripleo-heat-templates.git

Move deploy-steps-playbook to deploy-steps-tasks

So that we can more easily iterate over an include in an output

Change-Id: Idd5bb47589e5c37123caafcded1afbff8881aa33
---

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 b884e0e7..c6935e75 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 e5d7e98c..bd8d9bc0 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