From 20150864eb3ea1fbaa616f6a6cc022dc9bc13c14 Mon Sep 17 00:00:00 2001 From: Sam Alba Date: Thu, 24 Oct 2013 17:09:40 -0700 Subject: [PATCH] Removed dependency from dotcloud repos for the Nova docker driver Since the Nova driver is in Nova core from the Havana release, this will just clean the docker nova driver install. Change-Id: Ic98012b8b5e54e727a1b11f4d32f6623d2067621 --- lib/nova_plugins/hypervisor-docker | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/nova_plugins/hypervisor-docker b/lib/nova_plugins/hypervisor-docker index 427554b7db..2451982ed9 100644 --- a/lib/nova_plugins/hypervisor-docker +++ b/lib/nova_plugins/hypervisor-docker @@ -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