From b8ff250e9786e83055d293f9161a45a6179ed941 Mon Sep 17 00:00:00 2001
From: Feng Shengqin <feng.shengqin@zte.com.cn>
Date: Tue, 29 Jan 2019 09:40:31 +0800
Subject: [PATCH] Configure the dokcer daemon for IPv6

Change-Id: If190af800a8c28e2cf4ae320a770c40847cd18e6
---
 devstack/lib/docker | 8 ++++++++
 devstack/settings   | 1 +
 2 files changed, 9 insertions(+)

diff --git a/devstack/lib/docker b/devstack/lib/docker
index 4a807ac..306ab98 100644
--- a/devstack/lib/docker
+++ b/devstack/lib/docker
@@ -28,6 +28,7 @@ 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)
+ENABLE_IPV6=$(trueorfalse False ENABLE_IPV6)
 
 # Functions
 # ---------
@@ -112,6 +113,7 @@ function configure_docker {
     local docker_config_file=/etc/docker/daemon.json
     local debug
     local live_restore
+    local ipv6
     if [[ "$ENABLE_DEBUG_LOG_LEVEL" == "True" ]]; then
         debug=true
     else
@@ -122,6 +124,11 @@ function configure_docker {
     else
         live_restore=false
     fi
+    if [[ "$ENABLE_IPV6" == "True" ]]; then
+        ipv6=true
+    else
+        ipv6=false
+    fi
     sudo mkdir -p $(dirname ${docker_config_file})
     cat <<EOF | sudo tee $docker_config_file >/dev/null
 {
@@ -129,6 +136,7 @@ function configure_docker {
     $runtime_opts
     "debug": ${debug},
     "live-restore": ${live_restore},
+    "ipv6": ${ipv6},
     "group": "$DOCKER_GROUP",
 EOF
     if [[ -n "$DOCKER_CGROUP_DRIVER" ]]; then
diff --git a/devstack/settings b/devstack/settings
index 72318ea..79d0914 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -4,6 +4,7 @@
 CONTAINER_ENGINE=${CONTAINER_ENGINE:-docker}
 ENABLE_CLEAR_CONTAINER=${ENABLE_CLEAR_CONTAINER:-false}
 ENABLE_LIVE_RESTORE=${ENABLE_LIVE_RESTORE:-false}
+ENABLE_IPV6=${ENABLE_IPV6:-false}
 
 # Enable container services
 enable_service container