diff options
| author | Michael Gugino <mgugino@redhat.com> | 2018-02-06 13:37:56 -0500 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2018-02-06 13:37:56 -0500 |
| commit | c5eb3805edeedc04bee96fa69629403f59a5e6e6 (patch) | |
| tree | c0478dd3e26c9eee38f3b4e17644d554158e6c9b | |
| parent | fa6c7cc621ff05b35eadc846d3960ac2dc1009c0 (diff) | |
| download | openshift-c5eb3805edeedc04bee96fa69629403f59a5e6e6.tar.gz openshift-c5eb3805edeedc04bee96fa69629403f59a5e6e6.tar.bz2 openshift-c5eb3805edeedc04bee96fa69629403f59a5e6e6.tar.xz openshift-c5eb3805edeedc04bee96fa69629403f59a5e6e6.zip | |
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
| -rw-r--r-- | roles/openshift_master/tasks/system_container.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/node_system_container.yml | 2 |
2 files changed, 5 insertions, 1 deletions
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" diff --git a/roles/openshift_node/tasks/node_system_container.yml b/roles/openshift_node/tasks/node_system_container.yml index 008f209d7..e1a533e8e 100644 --- a/roles/openshift_node/tasks/node_system_container.yml +++ b/roles/openshift_node/tasks/node_system_container.yml @@ -13,7 +13,7 @@ values: - "DNS_DOMAIN={{ openshift.common.dns_domain }}" - "DOCKER_SERVICE={{ openshift_docker_service_name }}.service" - - "MASTER_SERVICE={{ openshift_service_type }}.service" + - "MASTER_SERVICE={{ openshift_service_type }}-master-controllers.service" - 'ADDTL_MOUNTS={{ l_node_syscon_add_mounts2 }}' state: latest vars: |