From c5eb3805edeedc04bee96fa69629403f59a5e6e6 Mon Sep 17 00:00:00 2001 From: Michael Gugino Date: Tue, 6 Feb 2018 13:37:56 -0500 Subject: Fix master and node system container variables This commit corrects service names and adds DOCKER_SERVICE variable to openshift_master system container creation. This will ensure services will restart correctly and in the proper order. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1542324 --- roles/openshift_master/tasks/system_container.yml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'roles/openshift_master') diff --git a/roles/openshift_master/tasks/system_container.yml b/roles/openshift_master/tasks/system_container.yml index dcbf7fd9f..21a29a204 100644 --- a/roles/openshift_master/tasks/system_container.yml +++ b/roles/openshift_master/tasks/system_container.yml @@ -18,6 +18,8 @@ state: latest values: - COMMAND=api + - "NODE_SERVICE={{ openshift_service_type }}-node.service" + - "DOCKER_SERVICE={{ openshift_docker_service_name }}.service" - name: Install or Update HA controller master system container oc_atomic_container: @@ -26,3 +28,5 @@ state: latest values: - COMMAND=controllers + - "NODE_SERVICE={{ openshift_service_type }}-node.service" + - "DOCKER_SERVICE={{ openshift_docker_service_name }}.service" -- cgit v1.2.1