devstack fixes

Signed-off-by: Chuck Short <chuck.short@canonical.com>
This commit is contained in:
Chuck Short 2015-06-07 20:44:57 -04:00
parent c5adabe830
commit bcceb6c1ca
1 changed files with 6 additions and 4 deletions

View File

@ -10,11 +10,10 @@
XTRACE=$(set +o | grep xtrace)
set +o xtrace
LXD_DIR=$DEST/nova-compute-lxd
LXD_BIN_DIR=$GOPATH/src/github.com/lxc/lxd
PYLXD_REPO=${LXC_REPO:-${GIT_BASE}/lxc/pylxd}
PYLXD_DIR=$DEST/pylxd
#LXC_REPO=${LXC_REPO:-${GIT_BASE}/zulcss/pylxd}
#LXC_DIR=$DEST/pylxd
LXD_DIR=${FLEX_DIR:-${DEST}/nova-compute-flex}
function configure_lxd {
@ -28,6 +27,9 @@ function configure_lxd {
}
function install_lxd {
git_clone $PYLXD_REPO $PYLXD_DIR
setup_develop $PYLXD_DIR
setup_develop $LXD_DIR
mkdir -p /etc/nova/rootwrap.d
sudo cp $LXD_DIR/etc/nova/rootwrap.d/* /etc/nova/rootwrap.d