Merge "Ensure DIB is installed from source"

This commit is contained in:
Zuul 2020-03-17 11:24:27 +00:00 committed by Gerrit Code Review
commit 2ec692f55a

View File

@ -53,13 +53,6 @@
with_items: "{{ iscsi_required_packages }}"
when: skip_install is not defined and 'iscsi' in enabled_deploy_interfaces
- name: "Diskimage-builder - Install"
include: pip_install.yml
package=diskimage-builder
sourcedir={{ dib_git_folder }}
source_install=true
when: skip_install is not defined and install_dib | bool == true
- name: "IPA-builder - Install"
include: pip_install.yml
package=ironic-python-agent-builder
@ -67,6 +60,15 @@
source_install=true
when: skip_install is not defined and install_dib | bool == true
# NOTE(mgoddard): IPA-builder has a dependency on diskimage-builder. Install
# DIB last to ensure it is installed from source rather than PyPI.
- name: "Diskimage-builder - Install"
include: pip_install.yml
package=diskimage-builder
sourcedir={{ dib_git_folder }}
source_install=true
when: skip_install is not defined and install_dib | bool == true
- name: "sushy - Install"
include: pip_install.yml
package=sushy