openstack/openstack-ansible
Code Issues Proposed changes

Remove unused DEPLOY_AIO variable

Browse Source 
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
This commit is contained in:
Mike Carden 2017-02-01 16:56:30 +11:00
parent fcc1d9bd4a
commit 3d60e4e2fa
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/gate-check-commit.sh
View File

@ -100,7 +100,6 @@ popd
log_instance_info log_instance_info
# Execute the Playbooks # Execute the Playbooks
export DEPLOY_AIO=true
bash "$(dirname "${0}")/run-playbooks.sh" bash "$(dirname "${0}")/run-playbooks.sh"
# Log some data about the instance and the rest of the system # Log some data about the instance and the rest of the system

5
scripts/run-playbooks.sh
View File

@ -17,7 +17,6 @@
set -e -u set -e -u
## Variables ----------------------------------------------------------------- ## Variables -----------------------------------------------------------------
DEPLOY_AIO=${DEPLOY_AIO:-false}
PLAYBOOK_LOGS=${PLAYBOOK_LOGS:-"/openstack/log/ansible_playbooks/"} PLAYBOOK_LOGS=${PLAYBOOK_LOGS:-"/openstack/log/ansible_playbooks/"}
COMMAND_LOGS=${COMMAND_LOGS:-"/openstack/log/ansible_cmd_logs/"} COMMAND_LOGS=${COMMAND_LOGS:-"/openstack/log/ansible_cmd_logs/"}
ORIG_ANSIBLE_LOG_PATH=${ANSIBLE_LOG_PATH:-"/openstack/log/ansible-logging/ansible.log"} 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. # Set the playbook log path so that we can review specific execution later.
export ANSIBLE_LOG_PATH="${PLAYBOOK_LOGS}/${COUNTER}-${include_file_name}.txt" export ANSIBLE_LOG_PATH="${PLAYBOOK_LOGS}/${COUNTER}-${include_file_name}.txt"
let COUNTER=COUNTER+=1 let COUNTER=COUNTER+=1
if [[ "${DEPLOY_AIO}" = true ]]; then
install_bits "${include_playbook}" install_bits "${include_playbook}"
fi
# Remove the generate playbook when done with it # Remove the generate playbook when done with it
rm "${include_playbook}" rm "${include_playbook}"
done done
@ -122,7 +119,6 @@ pushd "playbooks"
# Execute setup everything # Execute setup everything
playbook_run playbook_run
if [[ "${DEPLOY_AIO}" = true ]]; then
# Log some data about the instance and the rest of the system # Log some data about the instance and the rest of the system
log_instance_info log_instance_info
@ -133,5 +129,4 @@ pushd "playbooks"
-t "${COMMAND_LOGS}/repo_data" -t "${COMMAND_LOGS}/repo_data"
print_report print_report
fi
popd popd