diff options
| author |   Markos Chandras <mchandras@suse.de> | 2017-03-09 16:14:58 +0000 |
|---|---|---|
| committer | Markos Chandras <mchandras@suse.de> | 2017-03-09 22:37:11 +0000 |
| commit | 8b78537a7e24263af4760fd6fe10737099e0f988 (patch) | |
| tree | ab4f505496d3eba679a5345ecd2c64a32872e0e1 | |
| parent | 4c3461eed917211268dc173e3d54ecebae6724e3 (diff) | |
prototypes: bifrost: Fix ELEMENTS_PATH for latest diskimage-builder release
Upcoming diskimage-builder version (2.0.0) changed the location on
where dib elements are installed from /usr/share/diskimage-builder to
/usr/lib/$python/diskimage_builder/. However, base elements are included
by default so fix the script to set ELEMENTS_PATH to the path of our
out-of-tree elements.
Change-Id: Ib5c4e1465a67a819c9d495b0e0a64addeb0294cb
Signed-off-by: Markos Chandras <mchandras@suse.de>
| -rw-r--r-- | prototypes/bifrost/playbooks/test-bifrost-infracloud.yaml | 2 | ||||
| -rwxr-xr-x | prototypes/bifrost/scripts/test-bifrost-deployment.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/prototypes/bifrost/playbooks/test-bifrost-infracloud.yaml b/prototypes/bifrost/playbooks/test-bifrost-infracloud.yaml index 541a1f7d4..07d5e245b 100644 --- a/prototypes/bifrost/playbooks/test-bifrost-infracloud.yaml +++ b/prototypes/bifrost/playbooks/test-bifrost-infracloud.yaml @@ -54,7 +54,7 @@ dib_os_element: "{{ lookup('env','DIB_OS_ELEMENT') }}" dib_os_release: "{{ lookup('env', 'DIB_OS_RELEASE') }}" extra_dib_elements: "{{ lookup('env', 'EXTRA_DIB_ELEMENTS') | default('') }}" - dib_elements: "vm serial-console simple-init devuser infra-cloud-bridge puppet growroot {{ extra_dib_elements }}" + dib_elements: "vm enable-serial-console simple-init devuser infra-cloud-bridge puppet growroot {{ extra_dib_elements }}" dib_packages: "{{ lookup('env', 'DIB_OS_PACKAGES') }}" when: create_image_via_dib | bool == true and transform_boot_image | bool == false environment: diff --git a/prototypes/bifrost/scripts/test-bifrost-deployment.sh b/prototypes/bifrost/scripts/test-bifrost-deployment.sh index a47415091..b7165ffd1 100755 --- a/prototypes/bifrost/scripts/test-bifrost-deployment.sh +++ b/prototypes/bifrost/scripts/test-bifrost-deployment.sh @@ -54,7 +54,7 @@ WRITE_INTERFACES_FILE=true export BIFROST_INVENTORY_SOURCE=/tmp/baremetal.json # DIB custom elements path -export ELEMENTS_PATH=/usr/share/diskimage-builder/elements:/opt/puppet-infracloud/files/elements +export ELEMENTS_PATH=/opt/puppet-infracloud/files/elements # settings for console access export DIB_DEV_USER_PWDLESS_SUDO=yes |