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 b884e0e..c6935e7 100644 (file)
--- 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 e5d7e98..bd8d9bc 100644 (file)
--- 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