x
/
nova-lxd
Code Issues Proposed changes

Fix devstack integration 

- Actually install LXD
 - Fix git URL
 - s/granite/lxd/

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
This commit is contained in:
Stéphane Graber 2015-08-04 16:11:34 -04:00
parent 77dff13f87
commit 08a86ea2b5
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/devstack/README.first
View File

@ -1,4 +1,4 @@
contrib/devstack/ directory contains the files necessary to integrate Granite driver with devstack.
contrib/devstack/ directory contains the files necessary to integrate the LXD driver with devstack.
To install:
@ -6,5 +6,8 @@ git clone https://github.com/zulcss/nova-compute-lxd /opt/stack/nova-compute-lxd
git clone https://github.com/openstack-dev/devstack /opt/stack/devstack
cd /opt/stack/nova-compute-lxd
contrib/devstack/prepare-devstack.sh
contrib/devstack/prepare_devstack.sh
To run:
cd /opt/stack/devstack
./stack.sh

7
contrib/devstack/lib/lxd
View File

@ -10,7 +10,7 @@
XTRACE=$(set +o | grep xtrace)
set +o xtrace
PYLXD_REPO=${LXC_REPO:-${GIT_BASE}/lxc/pylxd}
PYLXD_REPO=${LXC_REPO:-git://github.com/lxc/pylxd}
PYLXD_DIR=$DEST/pylxd
LXD_DIR=${FLEX_DIR:-${DEST}/nova-compute-lxd}
@ -20,10 +20,9 @@ function configure_lxd {
install_package python-software-properties
apt_get update
sudo apt-add-repository -y ppa:ubuntu-lxc/lxc-git-master
# sudo apt-add-repository -y ppa:ubuntu-lxc/lxd-git-master
sudo apt-add-repository -y ppa:ubuntu-lxc/lxd-stable
apt_get update
install_package lxc lxc-dev
install_package lxd
}
function install_lxd {

8
contrib/devstack/prepare_devstack.sh
View File

@ -4,12 +4,12 @@ set -xe
env
NOVAGRANITEDIR=$(readlink -f $(dirname $0)/../..)
NOVALXDDIR=$(readlink -f $(dirname $0)/../..)
INSTALLDIR=${INSTALLDIR:-/opt/stack}
cp $NOVAGRANITEDIR/contrib/devstack/extras.d/70-lxd.sh $INSTALLDIR/devstack/extras.d
cp $NOVAGRANITEDIR/contrib/devstack/lib/nova_plugins/hypervisor-lxd $INSTALLDIR/devstack/lib/nova_plugins/
cp $NOVAGRANITEDIR/contrib/devstack/lib/lxd $INSTALLDIR/devstack/lib/lxd
cp $NOVALXDDIR/contrib/devstack/extras.d/70-lxd.sh $INSTALLDIR/devstack/extras.d
cp $NOVALXDDIR/contrib/devstack/lib/nova_plugins/hypervisor-lxd $INSTALLDIR/devstack/lib/nova_plugins/
cp $NOVALXDDIR/contrib/devstack/lib/lxd $INSTALLDIR/devstack/lib/lxd
cat - <<-EOF >> $INSTALLDIR/devstack/localrc
VIRT_DRIVER=lxd
export NON_STANDARD_REQS=1