Merge pull request #2348 from dgoodwin/ded-etcd-fix

Dedicated Etcd Upgrade Fix

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

@@ -188,7 +188,7 @@
   - include: docker/upgrade.yml
     when: l_docker_upgrade is defined and l_docker_upgrade | bool and not openshift.common.is_atomic | bool
   - include: "{{ node_config_hook }}"
-    when: node_config_hook is defined
+    when: node_config_hook is defined and inventory_hostname in groups.oo_nodes_to_config
 
   - include: rpm_upgrade.yml
     vars:

roles/openshift_version/tasks/main.yml

@@ -73,6 +73,10 @@
     msg: openshift_version role was unable to set openshift_pkg_version
   when: openshift_pkg_version is not defined
 
+- fail:
+    msg: "No OpenShift version available, please ensure your systems are fully registered and have access to appropriate yum repositories."
+  when: not is_containerized | bool and openshift_version == '0.0'
+
 # We can't map an openshift_release to full rpm version like we can with containers, make sure
 # the rpm version we looked up matches the release requested and error out if not.
 - fail: