From 2db7071b10619dcd90468dd801e607df7f7f533e Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Tue, 24 Oct 2017 00:08:59 +0000
Subject: [PATCH] Use shell.cmd with shell.executable

Rather than passing a string to the shell task and then using
shell.args.executable to choose an explicit executable, use
shell.cmd to set the actual script content so that shell.executable
can be used to choose the shell.

Change-Id: Ia24a21ce54746a486ba39c4eb7c32bc8470e32d4
---
 playbooks/release/tag.yaml         | 32 +++++++++++++++---------------
 roles/build-wheels/tasks/main.yaml |  4 ++--
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/playbooks/release/tag.yaml b/playbooks/release/tag.yaml
index b01182eb0a..72f127ef6d 100644
--- a/playbooks/release/tag.yaml
+++ b/playbooks/release/tag.yaml
@@ -1,24 +1,24 @@
 - hosts: all
   tasks:
     - name: Run release scripts
-      shell: |
-        set -x
+      shell:
+        cmd: |
+          set -x
 
-        RELEASES_DIR=$HOME/src/{{ zuul.project.canonical_name }}
-        # Tell the launchpad script run from release.sh where its
-        # credentials file is.
-        export LP_CREDS_FILE=~/.launchpadlib/creds
+          RELEASES_DIR=$HOME/src/{{ zuul.project.canonical_name }}
+          # Tell the launchpad script run from release.sh where its
+          # credentials file is.
+          export LP_CREDS_FILE=~/.launchpadlib/creds
 
-        # Pass the location of the openstack/releases repo to
-        # release_from_yaml.sh explicitly so it knows where to scan to
-        # look for modified files.
-        ~/scripts/release-tools/release_from_yaml.sh $RELEASES_DIR
-        RC1=$?
+          # Pass the location of the openstack/releases repo to
+          # release_from_yaml.sh explicitly so it knows where to scan to
+          # look for modified files.
+          ~/scripts/release-tools/release_from_yaml.sh $RELEASES_DIR
+          RC1=$?
 
-        # After we have tagged, create any new branches.
-        ~/scripts/release-tools/branch_from_yaml.sh $RELEASES_DIR
-        RC2=$?
+          # After we have tagged, create any new branches.
+          ~/scripts/release-tools/branch_from_yaml.sh $RELEASES_DIR
+          RC2=$?
 
-        exit $(($RC1 + $RC2))
-      args:
+          exit $(($RC1 + $RC2))
         executable: /bin/bash
diff --git a/roles/build-wheels/tasks/main.yaml b/roles/build-wheels/tasks/main.yaml
index 28e656b247..9c0a259f86 100644
--- a/roles/build-wheels/tasks/main.yaml
+++ b/roles/build-wheels/tasks/main.yaml
@@ -11,6 +11,6 @@
   become: yes
 
 - name: Build the wheel mirror
-  shell: ./scripts/wheel-build.sh {{ wheel_dir }} {{ wheel_python }}
-  args:
+  shell:
+    cmd: ./scripts/wheel-build.sh {{ wheel_dir }} {{ wheel_python }}
     executable: /bin/bash