Browse code

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

Sam Alba authored on 2013/10/25 09:09:40
Showing 1 changed files
... ...
@@ -24,7 +24,6 @@ set +o xtrace
24 24
 
25 25
 # Set up default directories
26 26
 DOCKER_DIR=$DEST/docker
27
-DOCKER_REPO=${DOCKER_REPO:-https://github.com/dotcloud/openstack-docker.git}
28 27
 DOCKER_BRANCH=${DOCKER_BRANCH:-master}
29 28
 
30 29
 DOCKER_UNIX_SOCKET=/var/run/docker.sock
... ...
@@ -54,10 +53,6 @@ function cleanup_nova_hypervisor() {
54 54
 
55 55
 # configure_nova_hypervisor - Set config files, create data dirs, etc
56 56
 function configure_nova_hypervisor() {
57
-    git_clone $DOCKER_REPO $DOCKER_DIR $DOCKER_BRANCH
58
-
59
-    ln -snf ${DOCKER_DIR}/nova-driver $NOVA_DIR/nova/virt/docker
60
-
61 57
     iniset $NOVA_CONF DEFAULT compute_driver docker.DockerDriver
62 58
     iniset $GLANCE_API_CONF DEFAULT container_formats ami,ari,aki,bare,ovf,docker
63 59