openstack/devstack
Code Issues Proposed changes

Merge "Removed dependency from dotcloud repos for the Nova docker driver"

Browse Source
This commit is contained in:
Jenkins
2013-10-28 23:00:56 +00:00
committed by Gerrit Code Review
parent d05bf6f528 20150864eb
commit 78cc3871de
1 changed files with 0 additions and 5 deletions
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