diff options
| -rw-r--r-- | bifrost/playbooks/opnfv-virtual.yaml | 15 | ||||
| -rwxr-xr-x | bifrost/scripts/bifrost-provision.sh | 4 | ||||
| -rwxr-xr-x | bifrost/scripts/destroy-env.sh | 2 |
3 files changed, 19 insertions, 2 deletions
diff --git a/bifrost/playbooks/opnfv-virtual.yaml b/bifrost/playbooks/opnfv-virtual.yaml index 310eca86..699c9669 100644 --- a/bifrost/playbooks/opnfv-virtual.yaml +++ b/bifrost/playbooks/opnfv-virtual.yaml @@ -35,6 +35,7 @@ become: yes gather_facts: yes roles: + - role: bifrost-keystone-install - role: bifrost-ironic-install cleaning: false testing: true @@ -57,6 +58,20 @@ dib_elements: "vm enable-serial-console simple-init devuser growroot {{ extra_dib_elements }}" dib_packages: "{{ lookup('env', 'DIB_OS_PACKAGES') }}" when: create_image_via_dib | bool == true and transform_boot_image | bool == false + - role: bifrost-keystone-client-config + # NOTE(hwoarang): This should be ansible_env.SUDO_USER like in the + # upstream playbook. However, we run ansible as root (ie with sudo) + # so clouds.yaml will be placed in the user's home directory (see + # the bifrost-keystone-client-config role) and then ansible will look + # for one in /root and fail. As such we hardcode the user to be 'root'. + user: "root" + clouds: + bifrost: + config_username: "{{ ironic.keystone.default_username }}" + config_password: "{{ ironic.keystone.default_password }}" + config_project_name: "baremetal" + config_region_name: "{{ keystone.bootstrap.region_name }}" + config_auth_url: "{{ keystone.bootstrap.public_url }}" environment: http_proxy: "{{ lookup('env','http_proxy') }}" https_proxy: "{{ lookup('env','https_proxy') }}" 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 |