openstack/devstack
Code Issues Proposed changes

Removed dependency from dotcloud repos for the Nova docker driver

Browse Source 
Since the Nova driver is in Nova core from the Havana release, this
will just clean the docker nova driver install.

Change-Id: Ic98012b8b5e54e727a1b11f4d32f6623d2067621
This commit is contained in:
Sam Alba 2013-10-24 17:09:40 -07:00
parent 4b3196f5a7
commit 20150864eb
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/nova_plugins/hypervisor-docker
View File

@ -24,7 +24,6 @@ set +o xtrace
# Set up default directories
DOCKER_DIR=$DEST/docker
DOCKER_REPO=${DOCKER_REPO:-https://github.com/dotcloud/openstack-docker.git}
DOCKER_BRANCH=${DOCKER_BRANCH:-master}
DOCKER_UNIX_SOCKET=/var/run/docker.sock
@ -54,10 +53,6 @@ function cleanup_nova_hypervisor() {
# configure_nova_hypervisor - Set config files, create data dirs, etc
function configure_nova_hypervisor() {
git_clone $DOCKER_REPO $DOCKER_DIR $DOCKER_BRANCH
ln -snf ${DOCKER_DIR}/nova-driver $NOVA_DIR/nova/virt/docker
iniset $NOVA_CONF DEFAULT compute_driver docker.DockerDriver
iniset $GLANCE_API_CONF DEFAULT container_formats ami,ari,aki,bare,ovf,docker