Browse Source

Do not install diskimage-builder from Git

Diskimage-builder recently dropped Python 2 support (>= 3.0.0).
Installing DIB from Git pulls Python 3-only DIB which breaks Python 2
devstack environments.

This patch drops the option to install DIB from Git. DIB will now
install what is set in stable/train upper-constraints.txt [1].

[1] 4ae10f52ce/upper-constraints.txt (L612)

Depends-On: https://review.opendev.org/#/c/733778/
Change-Id: I057f9a8353de471d605a5a5c2860d7caa9d3bd28
tags/5.0.2
Carlos Goncalves 1 month ago
parent
commit
4a95b35490
2 changed files with 1 additions and 10 deletions
  1. +1
    -7
      devstack/plugin.sh
  2. +0
    -3
      devstack/settings

+ 1
- 7
devstack/plugin.sh View File

@@ -39,13 +39,7 @@ function octavia_lib_install {
}

function install_diskimage_builder {
if use_library_from_git "diskimage-builder"; then
GITREPO["diskimage-builder"]=$DISKIMAGE_BUILDER_REPO_URL
GITDIR["diskimage-builder"]=$DISKIMAGE_BUILDER_DIR
GITBRANCH["diskimage-builder"]=$DISKIMAGE_BUILDER_REPO_REF
git_clone_by_name "diskimage-builder"
setup_dev_lib -bindep "diskimage-builder"
fi
setup_dev_lib -bindep "diskimage-builder"
}

function set_octavia_worker_image_owner_id {


+ 0
- 3
devstack/settings View File

@@ -2,9 +2,6 @@

OCTAVIA=${OCTAVIA:-"octavia"}
OCTAVIA_DIR=${OCTAVIA_DIR:-"${DEST}/octavia"}
DISKIMAGE_BUILDER_REPO_URL=${DISKIMAGE_BUILDER_REPO_URL:-${GIT_BASE}/openstack/diskimage-builder.git}
DISKIMAGE_BUILDER_REPO_REF=${DISKIMAGE_BUILDER_REPO_REF:-master}
DISKIMAGE_BUILDER_DIR=$DEST/diskimage-builder
OCTAVIA_BIN_DIR=${OCTAVIA_BIN_DIR:-$(get_python_exec_prefix)}
OCTAVIA_CONF_DIR=${OCTAVIA_CONF_DIR:-"/etc/octavia"}
OCTAVIA_SSH_DIR=${OCTAVIA_SSH_DIR:-${OCTAVIA_CONF_DIR}/.ssh}


Loading…
Cancel
Save