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