diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-08 08:40:48 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-08 08:40:48 -0800 |
| commit | 4c1a23823dd2c7ae238646d115ef95539dd64bf0 (patch) | |
| tree | a9e3013e35b5b0e34e67eaec7e2255aae75032f1 /roles | |
| parent | 5608019c7c70755d4839e6e0eef3ca5ab4f04277 (diff) | |
| parent | 45d3a1d919290daf5f2ca9523fb847db13de0ad6 (diff) | |
| download | openshift-4c1a23823dd2c7ae238646d115ef95539dd64bf0.tar.gz openshift-4c1a23823dd2c7ae238646d115ef95539dd64bf0.tar.bz2 openshift-4c1a23823dd2c7ae238646d115ef95539dd64bf0.tar.xz openshift-4c1a23823dd2c7ae238646d115ef95539dd64bf0.zip | |
Merge pull request #6624 from vrutkovs/containerized-avoid-replacing-node-unit
Automatic merge from submit-queue.
Don't overwrite node's systemd units for containerized install
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1527849
Perphaps this block should be removed, unless I'm missing some other case for it,
as systemd units are being updated in ../systemd_units.yml.
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_node/tasks/upgrade/config_changes.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_node/tasks/upgrade/config_changes.yml b/roles/openshift_node/tasks/upgrade/config_changes.yml index 50044eb3e..210d174c2 100644 --- a/roles/openshift_node/tasks/upgrade/config_changes.yml +++ b/roles/openshift_node/tasks/upgrade/config_changes.yml @@ -60,6 +60,7 @@ dest: "/etc/systemd/system/{{ openshift_service_type }}-node.service" src: "node.service.j2" register: l_node_unit + when: not openshift_is_containerized | bool - name: Reset selinux context command: restorecon -RF {{ openshift_node_data_dir }}/openshift.local.volumes @@ -74,4 +75,3 @@ # require a service to be part of the call. - name: Reload systemd units command: systemctl daemon-reload - when: l_node_unit is changed |