Remove pylxd from devstack installation
Remove pylxd from devstack installation because pylxd will be installed from the requirements.txt. Change-Id: I59c34bf100db2b087ac913dae895a1c031de65ea Signed-off-by: Chuck Short <chuck.short@canonical.com>
This commit is contained in:
parent
c3ed3574a5
commit
758ec7d6c6
|
@ -4,26 +4,6 @@
|
|||
# Functions to control the installation and configuration of the PowerVM
|
||||
# compute services
|
||||
|
||||
GITREPO["pylxd"]=${PYLXD_REPO:-https://github.com/lxc/pylxd}
|
||||
GITBRANCH["pylxd"]=${PYLXD_BRANCH:-master}
|
||||
GITDIR["pylxd"]=$DEST/pylxd
|
||||
|
||||
function install_pylxd {
|
||||
# Install the latest pylxd from git
|
||||
echo_summary "Installing pylxd"
|
||||
git_clone_by_name pylxd
|
||||
if [ "$DISTRO" == "trusty" ]; then
|
||||
uninstall_package python-requests python-urllib3
|
||||
fi
|
||||
setup_dev_lib "pylxd"
|
||||
echo_summary "Pylxd install complete"
|
||||
}
|
||||
|
||||
function cleanup_pylxd {
|
||||
echo_summary "Cleaning pylxd"
|
||||
rm -rf ${GITDIR["pylxd"]}
|
||||
}
|
||||
|
||||
function install_lxd {
|
||||
echo_summary "Checing LXD installation"
|
||||
if is_ubuntu; then
|
||||
|
|
|
@ -25,7 +25,6 @@ source $NOVA_COMPUTE_LXD_PLUGIN_DIR/nova-lxd-functions.sh
|
|||
function pre_install_nova-lxd() {
|
||||
# Install OS packages if necessary with "install_package ...".
|
||||
install_lxd
|
||||
install_pylxd
|
||||
}
|
||||
|
||||
function install_nova-lxd() {
|
||||
|
|
Loading…
Reference in New Issue