Merge pull request #18481 from mgugino-upstream-stage/fix-master-syscon-vars

Automatic merge from submit-queue (batch tested with PRs 18454, 18504, 18510, 18481, 18272).

Add DOCKER_SERVICE to master system-container

This commit adds DOCKER_SERVICE variable to
the origin master service unit templates
for system containers.

Needed-by: openshift/openshift-ansible#7031
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1542324

Author: openshift-merge-robot

Diff for: images/origin/system-container/manifest.json

@@ -5,7 +5,7 @@
         "ORIGIN_CONFIG_DIR": "/etc/origin",
         "ORIGIN_DATA_DIR": "/var/lib/origin",
         "ETCD_SERVICE": "etcd.service",
-        "NODE_SERVICE": "atomic-openshift-node.service"
+        "NODE_SERVICE": "atomic-openshift-node.service",
+        "DOCKER_SERVICE": "docker.service"
     }
 }
-

Diff for: images/origin/system-container/service.template

@@ -15,4 +15,4 @@ WorkingDirectory=$DESTDIR
 RuntimeDirectory=${NAME}
 
 [Install]
-WantedBy=docker.service
+WantedBy=${DOCKER_SERVICE}