소스 검색

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.
OpenShift Merge Robot 7 년 전
부모
커밋
4c1a23823d
1개의 변경된 파일1개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 1
      roles/openshift_node/tasks/upgrade/config_changes.yml

+ 1 - 1
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