Separate scripts creation tasks for under/overcloud.

The upgrade/update tasks in tripleo-upgrade started
with a create-scripts book, which generated most of
the scripts from the templates. However, this book
mixed the creation of scripts needed for the overcloud
as well as for the undercloud. This becomes an issue
when we want to perform only an undercloud upgrade, as
we are running tasks intended to the overcloud and it
might not even exist.
This patch divides the script creation tasks used for
the undercloud from the ones used for the overcloud.

Change-Id: I7e6c288dd0f974901fb85acb1ac806bcd4d9ee4d
Closes-Bug: #1769103
(cherry picked from commit abc439355e)

tasks/update/create-overcloud-update-scripts.yaml

@@ -1,11 +1,4 @@
 ---
-- name: create undercloud update script
-  template:
-    src: "{{ undercloud_update_template }}"
-    dest: "{{ undercloud_update_script }}"
-    mode: 0775
-    force: true
-
 - name: create scripts with workarounds
   template:
     src: "{{ update_workarounds_template }}"
@@ -13,8 +6,6 @@
     mode: 0755
     force: true
   with_items:
-    - '{{ pre_undercloud_update_workarounds|default([]) }}'
-    - '{{ post_undercloud_update_workarounds|default([]) }}'
     - '{{ pre_overcloud_update_workarounds|default([]) }}'
     - '{{ post_overcloud_update_workarounds|default([]) }}'
   when: updates_workarounds|bool

tasks/update/create-undercloud-update-scripts.yaml

@@ -0,0 +1,19 @@
+---
+- name: create undercloud update script
+  template:
+    src: "{{ undercloud_update_template }}"
+    dest: "{{ undercloud_update_script }}"
+    mode: 0775
+    force: true
+
+- name: create scripts with workarounds
+  template:
+    src: "{{ update_workarounds_template }}"
+    dest: "{{ working_dir }}/{{ item.script }}"
+    mode: 0755
+    force: true
+  with_items:
+    - '{{ pre_undercloud_update_workarounds|default([]) }}'
+    - '{{ post_undercloud_update_workarounds|default([]) }}'
+  when: updates_workarounds|bool
+

tasks/update/main.yml

@@ -1,8 +1,8 @@
 ---
-- name: create update scripts
-  include: create-update-scripts.yaml
-  tags: create_update_scripts
-  when: update_noop|bool or undercloud_update|bool or overcloud_update|bool
+- name: create undercloud update scripts
+  include: create-undercloud-update-scripts.yaml
+  tags: create_undercloud_update_scripts
+  when: update_noop|bool or undercloud_update|bool
 
 - block:
     - name: undercloud pre-update workarounds
@@ -27,6 +27,11 @@
 
   when: undercloud_update|bool
 
+- name: create overcloud update scripts
+  include: create-overcloud-update-scripts.yaml
+  tags: create_overcloud_update_scripts
+  when: update_noop|bool or overcloud_update|bool
+
 - block:
     - name: start l3 agent connectivity check
       shell: |

tasks/upgrade/create-overcloud-upgrade-scripts.yaml

@@ -99,20 +99,12 @@
     dest: "{{ workload_launch_script }}"
     mode: 0775
 
-- name: create undercloud upgrade script
-  template:
-    src: "{{ undercloud_upgrade_template }}"
-    dest: "{{ undercloud_upgrade_script }}"
-    mode: 0775
-
 - name: create upgrade workaround scripts
   template:
     src: workarounds.sh.j2
     dest: "{{working_dir}}/{{ item }}.sh"
     mode: 0775
   with_items:
-     - 'pre_undercloud_upgrade_workarounds'
-     - 'post_undercloud_upgrade_workarounds'
      - 'pre_docker_composable_upgrade_workarounds'
      - 'pre_nova_compute_upgrade_workarounds'
      - 'pre_docker_converge_upgrade_workarounds'

tasks/upgrade/create-undercloud-upgrade-scripts.yaml

@@ -0,0 +1,17 @@
+---
+- name: create undercloud upgrade script
+  template:
+    src: "{{ undercloud_upgrade_template }}"
+    dest: "{{ undercloud_upgrade_script }}"
+    mode: 0775
+
+- name: create upgrade workaround scripts
+  template:
+    src: workarounds.sh.j2
+    dest: "{{working_dir}}/{{ item }}.sh"
+    mode: 0775
+  with_items:
+     - 'pre_undercloud_upgrade_workarounds'
+     - 'post_undercloud_upgrade_workarounds'
+  when: upgrade_workarounds
+

tasks/upgrade/main.yml

@@ -1,8 +1,8 @@
 ---
-- name: create upgrade scripts
-  include: create-upgrade-scripts.yaml
-  tags: create_upgrade_scripts
-  when: upgrade_noop|bool or undercloud_upgrade|bool or overcloud_upgrade|bool
+- name: create undercloud upgrade scripts
+  include: create-undercloud-upgrade-scripts.yaml
+  tags: create_undercloud_upgrade_scripts
+  when: upgrade_noop|bool or undercloud_upgrade|bool
 
 - block:
     - name: apply pre undercloud upgrade workarounds
@@ -22,6 +22,11 @@
       when: upgrade_workarounds
   when: undercloud_upgrade|bool
 
+- name: create overcloud upgrade scripts
+  include: create-overcloud-upgrade-scripts.yaml
+  tags: create_overcloud_upgrade_scripts
+  when: upgrade_noop|bool or overcloud_upgrade|bool
+
 - block:
     # TODO: move this out of upgrade
     - name: download container images