diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-06-07 11:02:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-07 11:02:31 -0400 |
| commit | f0b8761e7d8da325f4b8fe79d52fb4f24dd950c4 (patch) | |
| tree | a44ecaeb07b896d7041313128a7c55d3016fbff4 | |
| parent | 7aee5574a64015a9d623ecde08458f5157125547 (diff) | |
| parent | 7302c2d7769a8adb428d0a0633aed2d1799f2c2a (diff) | |
| download | openshift-f0b8761e7d8da325f4b8fe79d52fb4f24dd950c4.tar.gz openshift-f0b8761e7d8da325f4b8fe79d52fb4f24dd950c4.tar.bz2 openshift-f0b8761e7d8da325f4b8fe79d52fb4f24dd950c4.tar.xz openshift-f0b8761e7d8da325f4b8fe79d52fb4f24dd950c4.zip | |
Merge pull request #4371 from ashcrow/1455843-again
Merged by openshift-bot
3 files changed, 17 insertions, 0 deletions
diff --git a/roles/openshift_node_upgrade/tasks/rpm_upgrade.yml b/roles/openshift_node_upgrade/tasks/rpm_upgrade.yml index 480e87d58..06a2d16ba 100644 --- a/roles/openshift_node_upgrade/tasks/rpm_upgrade.yml +++ b/roles/openshift_node_upgrade/tasks/rpm_upgrade.yml @@ -12,3 +12,18 @@ - name: Ensure python-yaml present for config upgrade package: name=PyYAML state=present when: not openshift.common.is_atomic | bool + +- name: Install Node service file + template: + dest: "/etc/systemd/system/{{ openshift.common.service_type }}-node.service" + src: "{{ openshift.common.service_type }}-node.service.j2" + register: l_node_unit + +# NOTE: This is needed to make sure we are using the correct set +# of systemd unit files. The RPMs lay down defaults but +# the install/upgrade may override them in /etc/systemd/system/. +# NOTE: We don't use the systemd module as some versions of the module +# require a service to be part of the call. +- name: Reload systemd units + command: systemctl daemon-reload + when: l_node_unit | changed diff --git a/roles/openshift_node_upgrade/templates/atomic-openshift-node.service.j2 b/roles/openshift_node_upgrade/templates/atomic-openshift-node.service.j2 new file mode 120000 index 000000000..6041fb13a --- /dev/null +++ b/roles/openshift_node_upgrade/templates/atomic-openshift-node.service.j2 @@ -0,0 +1 @@ +../../openshift_node/templates/atomic-openshift-node.service.j2
\ No newline at end of file diff --git a/roles/openshift_node_upgrade/templates/origin-node.service.j2 b/roles/openshift_node_upgrade/templates/origin-node.service.j2 new file mode 120000 index 000000000..79c45a303 --- /dev/null +++ b/roles/openshift_node_upgrade/templates/origin-node.service.j2 @@ -0,0 +1 @@ +../../openshift_node/templates/origin-node.service.j2
\ No newline at end of file |