diff options
Diffstat (limited to 'bifrost/scripts')
| -rwxr-xr-x | bifrost/scripts/bifrost-provision.sh | 4 | ||||
| -rwxr-xr-x | bifrost/scripts/destroy-env.sh | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/bifrost/scripts/bifrost-provision.sh b/bifrost/scripts/bifrost-provision.sh index d3b28ee1..05619625 100755 --- a/bifrost/scripts/bifrost-provision.sh +++ b/bifrost/scripts/bifrost-provision.sh @@ -70,7 +70,6 @@ export EXTRA_DIB_ELEMENTS=${EXTRA_DIB_ELEMENTS:-"openssh-server"} # Source Ansible set +x +o nounset $SCRIPT_HOME/env-setup.sh -source ${ANSIBLE_INSTALL_ROOT}/ansible/hacking/env-setup ANSIBLE=$(which ansible-playbook) set -x -o nounset @@ -121,7 +120,8 @@ ${ANSIBLE} ${ANSIBLE_VERBOSITY} \ -e create_ipa_image=${CREATE_IPA_IMAGE} \ -e write_interfaces_file=${WRITE_INTERFACES_FILE} \ -e ipv4_gateway=192.168.122.1 \ - -e wait_timeout=${PROVISION_WAIT_TIMEOUT} + -e wait_timeout=${PROVISION_WAIT_TIMEOUT} \ + -e enable_keystone=false EXITCODE=$? if [ $EXITCODE != 0 ]; then diff --git a/bifrost/scripts/destroy-env.sh b/bifrost/scripts/destroy-env.sh index d570f10a..c75e814b 100755 --- a/bifrost/scripts/destroy-env.sh +++ b/bifrost/scripts/destroy-env.sh @@ -16,6 +16,8 @@ fi # Start fresh rm -rf /opt/stack +# HOME is normally set by sudo -H +rm -rf ${HOME}/.config/openstack # Delete all libvirt VMs and hosts from vbmc (look for a port number) for vm in $(vbmc list | awk '/[0-9]/{{ print $2 }}'); do |