Update devstack support.
Signed-off-by: Chuck Short <chuck.short@canonical.com>
This commit is contained in:
parent
84f75a6e6f
commit
c5adabe830
|
@ -21,15 +21,13 @@ function configure_lxd {
|
||||||
install_package python-software-properties
|
install_package python-software-properties
|
||||||
apt_get update
|
apt_get update
|
||||||
|
|
||||||
sudo apt-add-repository -y ppa:ubuntu-lxc/lxd-daily
|
sudo apt-add-repository -y ppa:ubuntu-lxc/lxc-git-master
|
||||||
|
sudo apt-add-repository -y ppa:ubuntu-lxc/lxd-git-master
|
||||||
apt_get update
|
apt_get update
|
||||||
install_package lxd lxc-dev
|
install_package lxd lxc-dev lxd
|
||||||
}
|
}
|
||||||
|
|
||||||
function install_lxd {
|
function install_lxd {
|
||||||
# git_clone $LXC_REPO $LXC_DIR
|
|
||||||
# setup_develop $LXC_DIR
|
|
||||||
|
|
||||||
setup_develop $LXD_DIR
|
setup_develop $LXD_DIR
|
||||||
mkdir -p /etc/nova/rootwrap.d
|
mkdir -p /etc/nova/rootwrap.d
|
||||||
sudo cp $LXD_DIR/etc/nova/rootwrap.d/* /etc/nova/rootwrap.d
|
sudo cp $LXD_DIR/etc/nova/rootwrap.d/* /etc/nova/rootwrap.d
|
||||||
|
|
|
@ -35,8 +35,6 @@ function cleanup_nova_hypervisor {
|
||||||
# configure_nova_hypervisor - Set config files, create data dirs, etc
|
# configure_nova_hypervisor - Set config files, create data dirs, etc
|
||||||
function configure_nova_hypervisor {
|
function configure_nova_hypervisor {
|
||||||
iniset $NOVA_CONF DEFAULT compute_driver nclxd.nova.virt.lxd.LXDDriver
|
iniset $NOVA_CONF DEFAULT compute_driver nclxd.nova.virt.lxd.LXDDriver
|
||||||
iniset $GLANCE_API_CONF DEFAULT container_formats ami,ari,aki,bare,ovf,root-tar
|
|
||||||
iniset $GLANCE_API_CONF DEFAULT disk_formats ami,ari,aki,bare,ovf,root-tar
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# install_nova_hypervisor() - Install external components
|
# install_nova_hypervisor() - Install external components
|
||||||
|
|
|
@ -12,4 +12,5 @@ cp $NOVAGRANITEDIR/contrib/devstack/lib/nova_plugins/hypervisor-lxd $INSTALLDIR/
|
||||||
cp $NOVAGRANITEDIR/contrib/devstack/lib/lxd $INSTALLDIR/devstack/lib/lxd
|
cp $NOVAGRANITEDIR/contrib/devstack/lib/lxd $INSTALLDIR/devstack/lib/lxd
|
||||||
cat - <<-EOF >> $INSTALLDIR/devstack/localrc
|
cat - <<-EOF >> $INSTALLDIR/devstack/localrc
|
||||||
VIRT_DRIVER=lxd
|
VIRT_DRIVER=lxd
|
||||||
|
export NON_STANDARD_REQS=1
|
||||||
EOF
|
EOF
|
||||||
|
|
Loading…
Reference in New Issue