openstack
/
tripleo-quickstart
Code Issues Proposed changes

Merge "P->M upgrade we need pike containers, not the ones from master."

This commit is contained in:
Zuul 2018-02-02 01:25:49 +00:00 committed by Gerrit Code Review
parent c596102765 d9133623d0
commit 83da2f3315
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/release/tripleo-ci/master-undercloud-pike-overcloud.yml
View File

@ -6,11 +6,11 @@ overcloud_release: pike
dlrn_hash_tag: current-tripleo
dlrn_hash_tag_newest: current
docker_registry_host: trunk.registry.rdoproject.org
docker_registry_namespace: "{{ release }}"
docker_image_tag: "{{ dlrn_hash|default(dlrn_hash_tag) }}"
docker_registry_namespace: "{{ overcloud_release }}"
docker_image_tag: "{{ overcloud_docker_image_tag|default(dlrn_hash_tag) }}"
undercloud_image_url: https://images.rdoproject.org/master/delorean/{{ dlrn_hash|default(dlrn_hash_tag) }}/undercloud.qcow2
ipa_image_url: https://images.rdoproject.org/pike/delorean/{{ dlrn_hash|default(dlrn_hash_tag) }}/ironic-python-agent.tar
overcloud_image_url: https://images.rdoproject.org/pike/delorean/{{ dlrn_hash|default(dlrn_hash_tag) }}/overcloud-full.tar
ipa_image_url: https://images.rdoproject.org/pike/delorean/{{ overcloud_dlrn_hash|default(dlrn_hash_tag) }}/ironic-python-agent.tar
overcloud_image_url: https://images.rdoproject.org/pike/delorean/{{ overcloud_dlrn_hash|default(dlrn_hash_tag) }}/overcloud-full.tar
images:
- name: undercloud
url: "{{ undercloud_image_url }}"

24
roles/repo-setup/tasks/get-dlrn-hash.yml
View File

@ -26,6 +26,30 @@
dlrn_hash: "{{ full_hash_result.stdout }}"
cacheable: true
- when: overcloud_release is defined and overcloud_release != ""
block:
- name: Get DLRN overcloud hash
shell: >
curl -s https://trunk.rdoproject.org/centos7-{{ overcloud_release }}/{{ dlrn_hash_tag }}/delorean.repo \
| grep baseurl | grep -Eo '[a-zA-Z0-9]{40}_[a-zA-Z0-9]{8}'
register: full_overcloud_hash_result
- name: Set fact for overcloud dlrn_hash
set_fact:
overcloud_dlrn_hash: "{{ full_overcloud_hash_result.stdout }}"
cacheable: true
- name: Set fact for overcloud dlrn_hash path
set_fact:
overcloud_dlrn_hash_path: "{{ overcloud_dlrn_hash[:2] }}/{{ overcloud_dlrn_hash[2:4] }}/{{ overcloud_dlrn_hash }}"
cacheable: true
- name: Set fact for the overcloud Docker image tag
set_fact:
overcloud_docker_image_tag: "{{ overcloud_dlrn_hash }}"
cacheable: true
- name: Set fact for dlrn_hash path
set_fact:
dlrn_hash_path: "{{ dlrn_hash[:2] }}/{{ dlrn_hash[2:4] }}/{{ dlrn_hash }}"