Merge pull request #1469 from talset/playbook_upgrade

Add missing is_atomic condition in the upgrade playbook

playbooks/common/openshift-cluster/upgrades/v3_1_minor/upgrade.yml

@@ -13,10 +13,11 @@
   tasks:
   - name: Upgrade master packages
     command: "{{ ansible_pkg_mgr}} update -y {{ openshift.common.service_type }}-master{{ openshift_version }}"
+    when: not openshift.common.is_containerized | bool
 
   - name: Ensure python-yaml present for config upgrade
     action: "{{ ansible_pkg_mgr }} name=PyYAML state=present"
-    when: not openshift.common.is_atomic | bool
+    when: not openshift.common.is_containerized | bool
 
 # Currently 3.1.1 does not have any new configuration settings
 #
@@ -63,6 +64,7 @@
   tasks:
   - name: Upgrade node packages
     command: "{{ ansible_pkg_mgr }} update -y {{ openshift.common.service_type }}-node{{ openshift_version }}"
+    when: not openshift.common.is_containerized | bool
 
   - name: Restart node service
     service: name="{{ openshift.common.service_type }}-node" state=restarted