diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-09 16:44:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-09 16:44:30 +0000 |
| commit | a37898d70498db8ab73410684b4b3e83462ad2c8 (patch) | |
| tree | d01a70d0e6ba3385915b34418955c383173d1aba /devstack | |
| parent | 9669948732214398c430d368f8cdc089c5503108 (diff) | |
| parent | ca355adb703d696430d29c9be131c0d59beaf3ca (diff) | |
| download | ironic-a37898d70498db8ab73410684b4b3e83462ad2c8.tar.gz | |
Merge "devstack: install bindep for diskimage-builder"
Diffstat (limited to 'devstack')
| -rw-r--r-- | devstack/lib/ironic | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 5294f603a..9bd81efbe 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -68,6 +68,7 @@ IRONIC_PYTHON_AGENT_DIR=$DEST/ironic-python-agent IRONIC_PYTHON_AGENT_BUILDER_REPO=${IRONIC_PYTHON_AGENT_BUILDER_REPO:-${GIT_BASE}/openstack/ironic-python-agent-builder.git} IRONIC_PYTHON_AGENT_BUILDER_BRANCH=${IRONIC_PYTHON_AGENT_BUILDER_BRANCH:-$TARGET_BRANCH} IRONIC_PYTHON_AGENT_BUILDER_DIR=$DEST/ironic-python-agent-builder +IRONIC_DIB_BINDEP_FILE=https://opendev.org/openstack/diskimage-builder/raw/branch/master/bindep.txt IRONIC_DATA_DIR=$DATA_DIR/ironic IRONIC_STATE_PATH=/var/lib/ironic IRONIC_AUTH_CACHE_DIR=${IRONIC_AUTH_CACHE_DIR:-/var/cache/ironic} @@ -2526,8 +2527,12 @@ function rebuild_tinyipa_for_ansible { function install_diskimage_builder { if use_library_from_git "diskimage-builder"; then git_clone_by_name "diskimage-builder" - setup_dev_lib "diskimage-builder" + setup_dev_lib -bindep "diskimage-builder" else + local bindep_file + bindep_file=$(mktemp) + curl -o "$bindep_file" "$IRONIC_DIB_BINDEP_FILE" + install_bindep "$bindep_file" pip_install_gr "diskimage-builder" fi } |