From 320f80dbae3bb7b8b57239a5da99c0020a7f8a12 Mon Sep 17 00:00:00 2001
From: James Slagle <jslagle@redhat.com>
Date: Thu, 14 Sep 2017 09:31:58 -0600
Subject: [PATCH] Start sequence at 1 for deploy steps playbook

We should start the sequence at 1 instead of 0, since all our puppet
manifests assume the first step is 1. Trying to run our puppet manifests
with a hieradata value of step=0 actually results in an error because no
classes are included.

Change-Id: I93dc8b4cefbd729ba7afa3a4d81b4ac95344cac2
Closes-Bug: #1717292
---
 common/deploy-steps.j2                                    | 8 ++++----
 .../start-sequence-1-deploy-steps-59043a5ea87a83f8.yaml   | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 releasenotes/notes/start-sequence-1-deploy-steps-59043a5ea87a83f8.yaml

diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index c076a09d1f..6d3ef574f9 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -331,7 +331,7 @@ outputs:
               when: role_name == '{{role.name}}'
 {%- endfor %}
             - include: deploy_steps_tasks.yaml
-              with_sequence: start=0 end={{deploy_steps_max-1}}
+              with_sequence: count={{deploy_steps_max-1}}
               loop_control:
                 loop_var: step
       update_steps_tasks: |
@@ -344,11 +344,11 @@ outputs:
           serial: 1
           tasks:
             - include: update_steps_tasks.yaml
-              with_sequence: start=0 end={{update_steps_max-1}}
+              with_sequence: start=1 end={{update_steps_max-1}}
               loop_control:
                 loop_var: step
             - include: deploy_steps_tasks.yaml
-              with_sequence: start=0 end={{deploy_steps_max-1}}
+              with_sequence: start=1 end={{deploy_steps_max-1}}
               loop_control:
                 loop_var: step
       upgrade_steps_tasks: |
@@ -360,6 +360,6 @@ outputs:
         - hosts: overcloud
           tasks:
             - include: upgrade_steps_tasks.yaml
-              with_sequence: start=0 end={{upgrade_steps_max-1}}
+              with_sequence: start=1 end={{upgrade_steps_max-1}}
               loop_control:
                 loop_var: step
diff --git a/releasenotes/notes/start-sequence-1-deploy-steps-59043a5ea87a83f8.yaml b/releasenotes/notes/start-sequence-1-deploy-steps-59043a5ea87a83f8.yaml
new file mode 100644
index 0000000000..24a377252f
--- /dev/null
+++ b/releasenotes/notes/start-sequence-1-deploy-steps-59043a5ea87a83f8.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+  - Start sequence at 1 for the downloaded deploy steps playbook instead of 0.
+    The first step should be 1 since that is what the puppet manifests expect.