Specify all node packages and versions for upgrade

Package version is required for all dependent node packages or yum will
install the latest version

roles/openshift_control_plane/tasks/upgrade/rpm_upgrade.yml

@@ -1,20 +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 - yum
-  command: "{{ ansible_pkg_mgr }} install -y {{ master_pkgs | join(' ') }}"
-  vars:
-    master_pkgs:
-      - "{{ openshift_service_type }}{{ openshift_pkg_version }}"
-      - "{{ openshift_service_type }}-master{{ openshift_pkg_version }}"
-      - "{{ openshift_service_type }}-node{{ openshift_pkg_version }}"
-      - "{{ openshift_service_type }}-clients{{ openshift_pkg_version }}"
-  register: result
-  until: result is succeeded

roles/openshift_node/tasks/upgrade/rpm_upgrade.yml

@@ -5,6 +5,13 @@
 # - openshift_pkg_version
 # - openshift_is_atomic
 
+# 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.
+
 # Pre-pull new node rpm, but don't install
 - name: download new node packages
   command: "{{ ansible_pkg_mgr }} install -y --downloadonly {{ openshift_node_upgrade_rpm_list | join(' ')}}"
@@ -14,6 +21,7 @@
     - result.stdout is search(".*No package .* available.*") or result is failed
   vars:
     openshift_node_upgrade_rpm_list:
-      - "{{ openshift_service_type }}-node{{ openshift_pkg_version | default('') }}"
-      - "{{ openshift_service_type }}-clients{{ openshift_pkg_version | default('') }}"
-      - "PyYAML"
+      - "{{ openshift_service_type }}{{ openshift_pkg_version }}"
+      - "{{ openshift_service_type }}-hyperkube{{ openshift_pkg_version }}"
+      - "{{ openshift_service_type }}-node{{ openshift_pkg_version }}"
+      - "{{ openshift_service_type }}-clients{{ openshift_pkg_version }}"

roles/openshift_node/tasks/upgrade/rpm_upgrade_install.yml

@@ -5,15 +5,21 @@
 # - openshift_pkg_version
 # - openshift_is_atomic
 
+# 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.
+
 # Install the pre-pulled RPM
-# Note: dnsmasq is covered in it's own play.  openvswitch is included here
-# because once we have the latest rpm downloaded, it will happily be installed.
 - name: install new node packages
   command: "{{ ansible_pkg_mgr }} install -y {{ openshift_node_upgrade_rpm_list | join(' ')}}"
   register: result
   until: result is succeeded
   vars:
     openshift_node_upgrade_rpm_list:
-      - "{{ openshift_service_type }}-node{{ openshift_pkg_version | default('') }}"
-      - "{{ openshift_service_type }}-clients{{ openshift_pkg_version | default('') }}"
-      - "PyYAML"
+      - "{{ openshift_service_type }}{{ openshift_pkg_version }}"
+      - "{{ openshift_service_type }}-hyperkube{{ openshift_pkg_version }}"
+      - "{{ openshift_service_type }}-node{{ openshift_pkg_version }}"
+      - "{{ openshift_service_type }}-clients{{ openshift_pkg_version }}"

roles/openshift_version/tasks/first_master.yml

@@ -26,8 +26,6 @@
   when:
   - openshift_pkg_version is not defined
 
-# When double upgrade is in process, we want to set everything to match
-# openshift_verison.
 - block:
   - debug:
       msg: "openshift_image_tag was not defined. Falling back to v{{ openshift_version }}"
@@ -49,7 +47,7 @@
       openshift_pkg_version must match same major version as openshift_release.
       You provided: {{ openshift_release }} and {{ openshift_pkg_version }}
 
-# The end result of these three variables is quite important so make sure they are displayed and logged:
+# The end result of these variables is quite important so make sure they are displayed and logged:
 - debug: var=openshift_release
 
 - debug: var=openshift_image_tag