diff options
Diffstat (limited to 'bifrost')
| -rw-r--r-- | bifrost/playbooks/opnfv-virtual.yaml | 4 | ||||
| -rwxr-xr-x | bifrost/scripts/bifrost-provision.sh | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/bifrost/playbooks/opnfv-virtual.yaml b/bifrost/playbooks/opnfv-virtual.yaml index cfcb71a1..2ebf86f8 100644 --- a/bifrost/playbooks/opnfv-virtual.yaml +++ b/bifrost/playbooks/opnfv-virtual.yaml @@ -33,13 +33,13 @@ become: yes - name: Download the {{ xci_distro }} image checksum file get_url: - dest: /httpboot/{{ xci_distro }}.qcow2.sha256.txt + dest: /httpboot/deployment_image.qcow2.sha256.txt force: no url: http://artifacts.opnfv.org/releng/xci/images/{{ xci_distro }}.qcow2.sha256.txt timeout: 3000 become: yes - name: Extract checksum - shell: awk '{print $1}' /httpboot/{{ xci_distro }}.qcow2.sha256.txt + shell: awk '{print $1}' /httpboot/deployment_image.qcow2.sha256.txt register: _image_checksum - fail: msg: "Failed to get image checksum" diff --git a/bifrost/scripts/bifrost-provision.sh b/bifrost/scripts/bifrost-provision.sh index 5ebe2031..dccb3231 100755 --- a/bifrost/scripts/bifrost-provision.sh +++ b/bifrost/scripts/bifrost-provision.sh @@ -77,6 +77,12 @@ export DIB_OS_PACKAGES=${DIB_OS_PACKAGES:-"vlan,vim,less,bridge-utils,language-p # Additional dib elements export EXTRA_DIB_ELEMENTS=${EXTRA_DIB_ELEMENTS:-"openssh-server"} +# Copy the OS images if found +if [[ -e ${XCI_PATH}/deployment_image.qcow2 ]]; then + sudo mkdir -p /httpboot + sudo mv ${XCI_PATH}/deployment_image.qcow2* /httpboot/ +fi + if [ ${USE_VENV} = "true" ]; then export VENV=/opt/stack/bifrost $SCRIPT_HOME/env-setup.sh &>/dev/null |