From afa4fd5799b0ff43d625d061e4c2bde66b5fb86a Mon Sep 17 00:00:00 2001 From: Michael Gugino Date: Thu, 9 Nov 2017 17:00:00 -0500 Subject: Combine openshift_node and openshift_node_upgrade Currently, having openshift_node and openshift_node_upgrade as two distinct roles has created a duplication across handlers, templates, and some tasks. This commit combines the roles to reduce duplication and bugs encountered by not putting code in both places. --- roles/openshift_node_upgrade/tasks/rpm_upgrade.yml | 29 ---------------------- 1 file changed, 29 deletions(-) delete mode 100644 roles/openshift_node_upgrade/tasks/rpm_upgrade.yml (limited to 'roles/openshift_node_upgrade/tasks/rpm_upgrade.yml') diff --git a/roles/openshift_node_upgrade/tasks/rpm_upgrade.yml b/roles/openshift_node_upgrade/tasks/rpm_upgrade.yml deleted file mode 100644 index a998acf21..000000000 --- a/roles/openshift_node_upgrade/tasks/rpm_upgrade.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -# input variables: -# - openshift.common.service_type -# - component -# - openshift_pkg_version -# - openshift.common.is_atomic - -# We verified latest rpm available is suitable, so just yum update. -- name: Upgrade packages - package: "name={{ openshift.common.service_type }}-{{ component }}{{ openshift_pkg_version }} state=present" - -- 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: "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 -- cgit v1.2.3