From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 30 Jun 2017 03:52:38 +0000 (+0000)
Subject: Merge "Add detach to docker-toool"
X-Git-Tag: opnfv-6.0.0~459
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a759deedf0fb599d4fba89fc8741623f68a16322;p=apex-tripleo-heat-templates.git

Merge "Add detach to docker-toool"
---

a759deedf0fb599d4fba89fc8741623f68a16322
diff --cc docker/docker-toool
index 0b87ea92,3132f8e7..a1ffe34c
--- a/docker/docker-toool
+++ b/docker/docker-toool
@@@ -73,11 -77,9 +77,12 @@@ def parse_opts(argv)
  
      return opts
  
+ 
  def docker_arg_map(key, value):
      value = str(value).encode('ascii', 'ignore')
 +    if len(value) == 0:
 +        return ''
 +
      return {
          'environment': "--env=%s" % value,
          # 'image': value,