* 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
| ... | ... |
@@ -24,7 +24,6 @@ set +o xtrace |
| 24 | 24 |
|
| 25 | 25 |
# Set up default directories |
| 26 | 26 |
DOCKER_DIR=$DEST/docker |
| 27 |
-DOCKER_BRANCH=${DOCKER_BRANCH:-master}
|
|
| 28 | 27 |
|
| 29 | 28 |
DOCKER_UNIX_SOCKET=/var/run/docker.sock |
| 30 | 29 |
DOCKER_PID_FILE=/var/run/docker.pid |
| ... | ... |
@@ -55,8 +54,6 @@ function cleanup_nova_hypervisor() {
|
| 55 | 55 |
function configure_nova_hypervisor() {
|
| 56 | 56 |
iniset $NOVA_CONF DEFAULT compute_driver docker.DockerDriver |
| 57 | 57 |
iniset $GLANCE_API_CONF DEFAULT container_formats ami,ari,aki,bare,ovf,docker |
| 58 |
- |
|
| 59 |
- sudo cp -p ${DOCKER_DIR}/nova-driver/docker.filters $NOVA_CONF_DIR/rootwrap.d
|
|
| 60 | 58 |
} |
| 61 | 59 |
|
| 62 | 60 |
# install_nova_hypervisor() - Install external components |