diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-11-17 14:59:52 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-11-17 14:59:52 -0500 |
| commit | 544633e687e4d51c169eca435f7f356aad78bacf (patch) | |
| tree | a233986011ac1b1ef947ef1ef8a7d23b2487f460 | |
| parent | efc66e6fc367e2fa879d4c23cfe38c39470a0220 (diff) | |
| parent | 5e8c5c7073a373784709ea7605176b2cabc5de09 (diff) | |
| download | openshift-544633e687e4d51c169eca435f7f356aad78bacf.tar.gz openshift-544633e687e4d51c169eca435f7f356aad78bacf.tar.bz2 openshift-544633e687e4d51c169eca435f7f356aad78bacf.tar.xz openshift-544633e687e4d51c169eca435f7f356aad78bacf.zip | |
Merge pull request #926 from brenton/aep3
The aep3 images changed locations.
| -rw-r--r-- | .tito/packages/openshift-ansible | 2 | ||||
| -rw-r--r-- | openshift-ansible.spec | 8 | ||||
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/.tito/packages/openshift-ansible b/.tito/packages/openshift-ansible index c2f5784ce..d0cca83a2 100644 --- a/.tito/packages/openshift-ansible +++ b/.tito/packages/openshift-ansible @@ -1 +1 @@ -3.0.12-1 ./ +3.0.13-1 ./ diff --git a/openshift-ansible.spec b/openshift-ansible.spec index ffdbe65b7..a005320af 100644 --- a/openshift-ansible.spec +++ b/openshift-ansible.spec @@ -5,7 +5,7 @@ } Name: openshift-ansible -Version: 3.0.12 +Version: 3.0.13 Release: 1%{?dist} Summary: Openshift and Atomic Enterprise Ansible License: ASL 2.0 @@ -258,6 +258,12 @@ Atomic OpenShift Utilities includes %changelog +* Tue Nov 17 2015 Brenton Leanhardt <bleanhar@redhat.com> 3.0.13-1 +- The aep3 images changed locations. (bleanhar@redhat.com) +- atomic-openshift-installer: Correct single master case (smunilla@redhat.com) +- atomic-openshift-installer: Temporarily restrict to single master + (smunilla@redhat.com) + * Wed Nov 11 2015 Brenton Leanhardt <bleanhar@redhat.com> 3.0.12-1 - Sync with the latest image streams (sdodson@redhat.com) diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 091ba4e2b..51e3ef1c0 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -651,7 +651,7 @@ def set_deployment_facts_if_unset(facts): if deployment_type in ['enterprise', 'online', 'openshift-enterprise']: registry_url = 'openshift3/ose-${component}:${version}' elif deployment_type == 'atomic-enterprise': - registry_url = 'aep3/aep-${component}:${version}' + registry_url = 'aep3_beta/aep-${component}:${version}' facts[role]['registry_url'] = registry_url if 'master' in facts: |