Compare commits
6 Commits
rocky-eol
...
queens-eol
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0ac7780b26 | ||
|
|
86bf2c6d9d | ||
|
|
bb969c2075 | ||
|
|
55ea5c67f4 | ||
|
|
2299875327 | ||
| e00831a025 |
@@ -2,4 +2,4 @@
|
||||
host=review.opendev.org
|
||||
port=29418
|
||||
project=openstack/devstack-plugin-container.git
|
||||
defaultbranch=stable/rocky
|
||||
defaultbranch=stable/queens
|
||||
|
||||
@@ -27,7 +27,6 @@ DOCKER_CLUSTER_STORE=${DOCKER_CLUSTER_STORE:-}
|
||||
DOCKER_GROUP=${DOCKER_GROUP:-$STACK_USER}
|
||||
DOCKER_CGROUP_DRIVER=${DOCKER_CGROUP_DRIVER:-}
|
||||
ENABLE_CLEAR_CONTAINER=$(trueorfalse False ENABLE_CLEAR_CONTAINER)
|
||||
ENABLE_LIVE_RESTORE=$(trueorfalse False ENABLE_LIVE_RESTORE)
|
||||
|
||||
# Functions
|
||||
# ---------
|
||||
@@ -111,24 +110,17 @@ function configure_docker {
|
||||
fi
|
||||
local docker_config_file=/etc/docker/daemon.json
|
||||
local debug
|
||||
local live_restore
|
||||
if [[ "$ENABLE_DEBUG_LOG_LEVEL" == "True" ]]; then
|
||||
debug=true
|
||||
else
|
||||
debug=false
|
||||
fi
|
||||
if [[ "$ENABLE_LIVE_RESTORE" == "True" ]]; then
|
||||
live_restore=true
|
||||
else
|
||||
live_restore=false
|
||||
fi
|
||||
sudo mkdir -p $(dirname ${docker_config_file})
|
||||
cat <<EOF | sudo tee $docker_config_file >/dev/null
|
||||
{
|
||||
$cluster_store_opts
|
||||
$runtime_opts
|
||||
"debug": ${debug},
|
||||
"live-restore": ${live_restore},
|
||||
"group": "$DOCKER_GROUP",
|
||||
EOF
|
||||
if [[ -n "$DOCKER_CGROUP_DRIVER" ]]; then
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
CONTAINER_ENGINE=${CONTAINER_ENGINE:-docker}
|
||||
ENABLE_CLEAR_CONTAINER=${ENABLE_CLEAR_CONTAINER:-false}
|
||||
ENABLE_LIVE_RESTORE=${ENABLE_LIVE_RESTORE:-false}
|
||||
|
||||
# Enable container services
|
||||
enable_service container
|
||||
|
||||
Reference in New Issue
Block a user