openstack/openstack-ansible-ops
Code Issues Proposed changes

Remove BOOTSTRAP_ANSIBLE_FOLDER variable

Browse Source 
Removes the BOOTSTRAP_ANSIBLE_FOLDER variable because
the assumption was made that Ansible would always be
bootstrapped from /opt/openstack-ansible and setting
this would cause a noop when Ansible was bootstrapped.

Change-Id: I284ad62b6f14cc334ae949946e839a1e8ec6a1d8
This commit is contained in:
Antony Messerli 2018-01-22 12:58:36 -06:00
parent bfa655cbee
commit f5e74f065f
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
leap-upgrades/lib/functions.sh
View File

@ -151,7 +151,7 @@ function bootstrap_recent_ansible {
notice "Removed System installed Ansible" notice "Removed System installed Ansible"
done done
pushd "${BOOTSTRAP_ANSIBLE_FOLDER}" pushd /opt/openstack-ansible
# Install ansible for system migrations # Install ansible for system migrations
scripts/bootstrap-ansible.sh scripts/bootstrap-ansible.sh
popd popd

3
leap-upgrades/lib/vars.sh
View File

@ -42,9 +42,6 @@ export VENV_URL="${VENV_URL:-https://rpc-repo.rackspace.com/venvs/leap-bundles}"
export VALIDATE_UPGRADE_INPUT="${VALIDATE_UPGRADE_INPUT:-TRUE}" export VALIDATE_UPGRADE_INPUT="${VALIDATE_UPGRADE_INPUT:-TRUE}"
export CODE_UPGRADE_FROM="${CODE_UPGRADE_FROM:-}" export CODE_UPGRADE_FROM="${CODE_UPGRADE_FROM:-}"
# Bootstrap ansible tool, see also bootstrap_recent_ansible
export BOOTSTRAP_ANSIBLE_FOLDER=${BOOTSTRAP_ANSIBLE_FOLDER:-/opt/openstack-ansible/}
## Ansible debugging ## Ansible debugging
export LEAP_TIMESTAMP=$(date +%s) export LEAP_TIMESTAMP=$(date +%s)
export ANSIBLE_LOG_PATH="/opt/leap42/ansible-${LEAP_TIMESTAMP}.log" export ANSIBLE_LOG_PATH="/opt/leap42/ansible-${LEAP_TIMESTAMP}.log"