Skip to content

Commit 2d92c53

Browse files
committed
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
1 parent c9e126b commit 2d92c53

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

images/origin/system-container/manifest.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"ORIGIN_CONFIG_DIR": "/etc/origin",
66
"ORIGIN_DATA_DIR": "/var/lib/origin",
77
"ETCD_SERVICE": "etcd.service",
8-
"NODE_SERVICE": "atomic-openshift-node.service"
8+
"NODE_SERVICE": "atomic-openshift-node.service",
9+
"DOCKER_SERVICE": "docker.service"
910
}
1011
}
11-

images/origin/system-container/service.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ WorkingDirectory=$DESTDIR
1515
RuntimeDirectory=${NAME}
1616

1717
[Install]
18-
WantedBy=docker.service
18+
WantedBy=${DOCKER_SERVICE}

0 commit comments

Comments
 (0)