diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-08-23 14:49:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-23 14:49:23 -0400 |
| commit | dba67f91f734e93b7932e25f4f0461c7a6da8d27 (patch) | |
| tree | 88cb5e251723d46f344c7225a3b426b6b6395c64 | |
| parent | 46856f244abfcf02bc84a95de191cfce4c62c04d (diff) | |
| parent | 8681ae6983aa20d66ea8741a2ea7d86a4906bcf3 (diff) | |
| download | openshift-dba67f91f734e93b7932e25f4f0461c7a6da8d27.tar.gz openshift-dba67f91f734e93b7932e25f4f0461c7a6da8d27.tar.bz2 openshift-dba67f91f734e93b7932e25f4f0461c7a6da8d27.tar.xz openshift-dba67f91f734e93b7932e25f4f0461c7a6da8d27.zip | |
Merge pull request #2348 from dgoodwin/ded-etcd-fix
Dedicated Etcd Upgrade Fix
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/upgrade.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_version/tasks/main.yml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/upgrade.yml index f7ff16fb8..be4e02c4a 100644 --- a/playbooks/common/openshift-cluster/upgrades/upgrade.yml +++ b/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: diff --git a/roles/openshift_version/tasks/main.yml b/roles/openshift_version/tasks/main.yml index 6e5d2b22c..a3a99d248 100644 --- a/roles/openshift_version/tasks/main.yml +++ b/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: |