Make GIT_REPO can be configured
In devstack/plugin.sh, the repository is just git.openstack.org, it should be configurable Change-Id: Ib9ce0a88c686a308c6fb424c94f64071f49ab8a1
This commit is contained in:
parent
e40b69168a
commit
cee1869a0d
|
@ -7,8 +7,8 @@ function octavia_install {
|
|||
setup_develop $OCTAVIA_DIR
|
||||
if ! [ "$DISABLE_AMP_IMAGE_BUILD" == 'True' ]; then
|
||||
install_package qemu kpartx
|
||||
git_clone https://git.openstack.org/openstack/diskimage-builder.git $DEST/diskimage-builder master
|
||||
git_clone https://git.openstack.org/openstack/tripleo-image-elements.git $DEST/tripleo-image-elements master
|
||||
git_clone $DISKIMAGE_BUILDER_REPO $DISKIMAGE_BUILDER_DIR $DISKIMAGE_BUILDER_BRANCH
|
||||
git_clone $TRIPLEO_IMAGE_ELEMENTS_REPO $TRIPLEO_IMAGE_ELEMENTS_DIR $TRIPLEO_IMAGE_ELEMENTS_BRANCH
|
||||
sudo -H -E pip install -r $DEST/diskimage-builder/requirements.txt
|
||||
fi
|
||||
}
|
||||
|
|
|
@ -2,6 +2,12 @@
|
|||
|
||||
OCTAVIA=${OCTAVIA:-"octavia"}
|
||||
OCTAVIA_DIR=${OCTAVIA_DIR:-"${DEST}/octavia"}
|
||||
DISKIMAGE_BUILDER_REPO=${DISKIMAGE_BUILDER_REPO:-${GIT_BASE}/openstack/diskimage-builder.git}
|
||||
DISKIMAGE_BUILDER_BRANCH=${DISKIMAGE_BUILDER_BRANCH:-master}
|
||||
DISKIMAGE_BUILDER_DIR=$DEST/diskimage-builder
|
||||
TRIPLEO_IMAGE_ELEMENTS_REPO=${TRIPLEO_IMAGE_ELEMENTS_REPO:-${GIT_BASE}/openstack/tripleo-image-elements.git}
|
||||
TRIPLEO_IMAGE_ELEMENTS_BRANCH=${TRIPLEO_IMAGE_ELEMENTS_BRANCH:-master}
|
||||
TRIPLEO_IMAGE_ELEMENTS_DIR=$DEST/tripleo-image-elements
|
||||
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…
Reference in New Issue