From 3d60e4e2fa7232920e516bdae3af6dfd30659abf Mon Sep 17 00:00:00 2001
From: Mike Carden <mike.carden@gmail.com>
Date: Wed, 1 Feb 2017 16:56:30 +1100
Subject: [PATCH] Remove unused DEPLOY_AIO variable

Commit https://review.openstack.org/#/c/411406/ exposed the fact that
the run-playbooks.sh script wasn't making use of the DEPLOY_AIO variable
in a useful way, and as a result, the script is exiting without building
an AIO.

This patch removes the dependency on that variable.

Change-Id: Ic5c60c7f29ead048599d5c64cfbd08fbf7f9e480
Co-Authored-By: chris@distroguy.com
---
 scripts/gate-check-commit.sh | 1 -
 scripts/run-playbooks.sh     | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/scripts/gate-check-commit.sh b/scripts/gate-check-commit.sh
index df293dcb91..3ac81577ba 100755
--- a/scripts/gate-check-commit.sh
+++ b/scripts/gate-check-commit.sh
@@ -100,7 +100,6 @@ popd
 log_instance_info
 
 # Execute the Playbooks
-export DEPLOY_AIO=true
 bash "$(dirname "${0}")/run-playbooks.sh"
 
 # Log some data about the instance and the rest of the system
diff --git a/scripts/run-playbooks.sh b/scripts/run-playbooks.sh
index 1bc88fcd17..b9b85061e0 100755
--- a/scripts/run-playbooks.sh
+++ b/scripts/run-playbooks.sh
@@ -17,7 +17,6 @@
 set -e -u
 
 ## Variables -----------------------------------------------------------------
-DEPLOY_AIO=${DEPLOY_AIO:-false}
 PLAYBOOK_LOGS=${PLAYBOOK_LOGS:-"/openstack/log/ansible_playbooks/"}
 COMMAND_LOGS=${COMMAND_LOGS:-"/openstack/log/ansible_cmd_logs/"}
 ORIG_ANSIBLE_LOG_PATH=${ANSIBLE_LOG_PATH:-"/openstack/log/ansible-logging/ansible.log"}
@@ -95,9 +94,7 @@ function playbook_run {
       # Set the playbook log path so that we can review specific execution later.
       export ANSIBLE_LOG_PATH="${PLAYBOOK_LOGS}/${COUNTER}-${include_file_name}.txt"
       let COUNTER=COUNTER+=1
-      if [[ "${DEPLOY_AIO}" = true ]]; then
         install_bits "${include_playbook}"
-      fi
       # Remove the generate playbook when done with it
       rm "${include_playbook}"
     done
@@ -122,7 +119,6 @@ pushd "playbooks"
   # Execute setup everything
   playbook_run
 
-  if [[ "${DEPLOY_AIO}" = true ]]; then
     # Log some data about the instance and the rest of the system
     log_instance_info
 
@@ -133,5 +129,4 @@ pushd "playbooks"
                           -t "${COMMAND_LOGS}/repo_data"
 
     print_report
-  fi
 popd