openstack/devstack
Code Issues Proposed changes

removed unecessary lines for docker install

Browse Source 
* script was trying to copy file from a source
	that doesn't exist to destination that does.
* variable DOCKER_BRANCH no longer used.

Change-Id: I50fd55e97dfc4eaaa3c1f2bfc42e8cfc0e76cdf4
This commit is contained in:
Paul Czarkowski 2013-10-29 17:15:22 -05:00 committed by Paul Czarkowski
parent 8dc25718ae
commit eca0a1c7b9
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/nova_plugins/hypervisor-docker
View File

@ -24,7 +24,6 @@ set +o xtrace
# Set up default directories
DOCKER_DIR=$DEST/docker
DOCKER_BRANCH=${DOCKER_BRANCH:-master}
DOCKER_UNIX_SOCKET=/var/run/docker.sock
DOCKER_PID_FILE=/var/run/docker.pid
@ -55,8 +54,6 @@ function cleanup_nova_hypervisor() {
function configure_nova_hypervisor() {
iniset $NOVA_CONF DEFAULT compute_driver docker.DockerDriver
iniset $GLANCE_API_CONF DEFAULT container_formats ami,ari,aki,bare,ovf,docker
sudo cp -p ${DOCKER_DIR}/nova-driver/docker.filters $NOVA_CONF_DIR/rootwrap.d
}
# install_nova_hypervisor() - Install external components