Merge pull request #115 from Ichimonji10/docker

Fix command which populates /etc/sysconfig/docker
SatelliteQE · Jan 16, 2015 · 549d462 · 549d462
2 parents 298c1cd + 52a84c8
commit 549d462
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/automation_tools/__init__.py b/automation_tools/__init__.py
@@ -251,17 +251,14 @@ def setup_default_docker():
 
     # SElinux workaround let us use ``http://localhost:2375`` for a
     # ``Docker`` Compute Resurce.
-    options = ' '.join([
-        '--selinux-enabled',
-        '-H tcp://0.0.0.0:2375',
-        '-H unix:///var/run/docker.sock',
-    ])
-    if os_version >= 7:
-        run('echo OPTIONS={0} >> /etc/sysconfig/docker'.format(options))
-    else:
-        run(
-            r'echo other_args=\"{0}\" >> /etc/sysconfig/docker'.format(options)
-        )
+    run('sed -i -e "s|^{0}=.*|{0}=\'{1}\'|" /etc/sysconfig/docker'.format(
+        'OPTIONS' if os_version >= 7 else 'other_args',
+        ' '.join([
+            '--selinux-enabled true',
+            '--host tcp://0.0.0.0:2375',
+            '--host unix:///var/run/docker.sock',
+        ])
+    ))
 
     # Restart ``docker`` service
     if os_version >= 7: