summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHongbin Lu <hongbin.lu@huawei.com>2017-07-04 22:27:18 +0000
committerHongbin Lu <hongbin.lu@huawei.com>2017-07-04 22:28:57 +0000
commit3a078f976805c124a3d565523430d0a8b731d9bf (patch)
tree62b2e36c7067656ddec88241c78793dd5782b24c
parent1f79d17844d7cb16b45e45ec4b324f3ffcd42c4b (diff)
Remove duplicated session in systemd unit file
The session 'Service' is duplicated in the docker systemd drop-in. Change-Id: Ia391052c4376be207ff5e43fb18ddcb5251a0784
Notes
Notes (review): Code-Review+2: Sam Yaple <sam@yaple.net> Code-Review+2: Liping Mao <limao@cisco.com> Workflow+1: Liping Mao <limao@cisco.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 05 Jul 2017 06:34:51 +0000 Reviewed-on: https://review.openstack.org/480304 Project: openstack/devstack-plugin-container Branch: refs/heads/master
-rw-r--r--devstack/lib/docker2
1 files changed, 0 insertions, 2 deletions
diff --git a/devstack/lib/docker b/devstack/lib/docker
index f8dcc5d..4995d55 100644
--- a/devstack/lib/docker
+++ b/devstack/lib/docker
@@ -101,8 +101,6 @@ EOF
101[Service] 101[Service]
102ExecStart= 102ExecStart=
103ExecStart=/usr/bin/dockerd --config-file=$docker_config_file 103ExecStart=/usr/bin/dockerd --config-file=$docker_config_file
104
105[Service]
106Environment="HTTP_PROXY=$http_proxy" "HTTPS_PROXY=$https_proxy" "NO_PROXY=$no_proxy" 104Environment="HTTP_PROXY=$http_proxy" "HTTPS_PROXY=$https_proxy" "NO_PROXY=$no_proxy"
107EOF 105EOF
108 sudo systemctl daemon-reload 106 sudo systemctl daemon-reload