diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-02-08 15:08:08 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-08 15:08:08 -0800 |
| commit | 2936995d7d24a8c81b81d1d473fc48b6a374f2b4 (patch) | |
| tree | fd626edffd401772b05d0731d71b4d7570324d2d | |
| parent | 70914a6b13d9462e5348af268a67691c641d6634 (diff) | |
| parent | c5eb3805edeedc04bee96fa69629403f59a5e6e6 (diff) | |
| download | openshift-2936995d7d24a8c81b81d1d473fc48b6a374f2b4.tar.gz openshift-2936995d7d24a8c81b81d1d473fc48b6a374f2b4.tar.bz2 openshift-2936995d7d24a8c81b81d1d473fc48b6a374f2b4.tar.xz openshift-2936995d7d24a8c81b81d1d473fc48b6a374f2b4.zip | |
Merge pull request #7031 from mgugino-upstream-stage/fix-syscon-vars
Automatic merge from submit-queue.
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: |