diff options
author | Michael Gugino <mgugino@redhat.com> | 2017-11-09 17:48:27 -0500 |
---|---|---|
committer | Michael Gugino <mgugino@redhat.com> | 2017-11-09 17:48:27 -0500 |
commit | 4877e1c21a26d2aba314e6272478005d12b7f14b (patch) | |
tree | dffbc50aee9211685265d0a570156aa5103f778c /playbooks/common/openshift-cluster/upgrades/rpm_upgrade.yml | |
parent | 7900f45d2d8ef566cf3f330a33364dd217a93c1d (diff) | |
download | openshift-4877e1c21a26d2aba314e6272478005d12b7f14b.tar.gz openshift-4877e1c21a26d2aba314e6272478005d12b7f14b.tar.bz2 openshift-4877e1c21a26d2aba314e6272478005d12b7f14b.tar.xz openshift-4877e1c21a26d2aba314e6272478005d12b7f14b.zip |
Combine master upgrade play with role
Currently, there are plays importing tasks directly from
openshift_master role. This has caused numerous bugs
and code duplicaiton in the past.
This commit combines the upgrade into openshift_master role
utilizing include_role syntax.
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades/rpm_upgrade.yml')
-rw-r--r-- | playbooks/common/openshift-cluster/upgrades/rpm_upgrade.yml | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/rpm_upgrade.yml b/playbooks/common/openshift-cluster/upgrades/rpm_upgrade.yml deleted file mode 100644 index 8cc46ab68..000000000 --- a/playbooks/common/openshift-cluster/upgrades/rpm_upgrade.yml +++ /dev/null @@ -1,38 +0,0 @@ ---- -# When we update package "a-${version}" and a requires b >= ${version} if we -# don't specify the version of b yum will choose the latest version of b -# available and the whole set of dependencies end up at the latest version. -# Since the package module, unlike the yum module, doesn't flatten a list -# of packages into one transaction we need to do that explicitly. The ansible -# core team tells us not to rely on yum module transaction flattening anyway. - -# TODO: If the sdn package isn't already installed this will install it, we -# should fix that -- name: Upgrade master packages - package: name={{ master_pkgs | join(',') }} state=present - vars: - master_pkgs: - - "{{ openshift.common.service_type }}{{ openshift_pkg_version }}" - - "{{ openshift.common.service_type }}-master{{ openshift_pkg_version }}" - - "{{ openshift.common.service_type }}-node{{ openshift_pkg_version }}" - - "{{ openshift.common.service_type }}-sdn-ovs{{ openshift_pkg_version }}" - - "{{ openshift.common.service_type }}-clients{{ openshift_pkg_version }}" - - "tuned-profiles-{{ openshift.common.service_type }}-node{{ openshift_pkg_version }}" - - PyYAML - when: - - component == "master" - - not openshift.common.is_atomic | bool - -- name: Upgrade node packages - package: name={{ node_pkgs | join(',') }} state=present - vars: - node_pkgs: - - "{{ openshift.common.service_type }}{{ openshift_pkg_version }}" - - "{{ openshift.common.service_type }}-node{{ openshift_pkg_version }}" - - "{{ openshift.common.service_type }}-sdn-ovs{{ openshift_pkg_version }}" - - "{{ openshift.common.service_type }}-clients{{ openshift_pkg_version }}" - - "tuned-profiles-{{ openshift.common.service_type }}-node{{ openshift_pkg_version }}" - - PyYAML - when: - - component == "node" - - not openshift.common.is_atomic | bool |