Update software dependencies to pike releases

For kolla, kolla-ansible and bifrost, we are now using a stackhpc/<release> branch
naming scheme rather than referencing tags in forked repos. It is recommended to
override these branches to specific tags for repeatable builds.

The Ironic Python Agent source version and tarball URLs have also been updated to
point to the pike release artifacts.

Finally, the kolla_openstack_release has been set to 5.0.0, following the
kolla-ansible second pike release candidate on which the stackhpc/pike branches
are currently based.
This commit is contained in:
Mark Goddard 2017-09-14 15:21:03 +01:00
parent 444801af0e
commit f008b6a675
3 changed files with 7 additions and 7 deletions

View File

@ -8,7 +8,7 @@
kolla_bifrost_source_url: "https://github.com/stackhpc/bifrost" kolla_bifrost_source_url: "https://github.com/stackhpc/bifrost"
# Version (branch, tag, etc.) of Bifrost source code repository. # Version (branch, tag, etc.) of Bifrost source code repository.
kolla_bifrost_source_version: "stackhpc-3.0.0" kolla_bifrost_source_version: "stackhpc/pike"
############################################################################### ###############################################################################
# Diskimage-builder configuration. # Diskimage-builder configuration.

View File

@ -11,7 +11,7 @@ ipa_build_images: False
ipa_build_source_url: "https://github.com/openstack/ironic-python-agent" ipa_build_source_url: "https://github.com/openstack/ironic-python-agent"
# Version of IPA source repository. # Version of IPA source repository.
ipa_build_source_version: "stable/ocata" ipa_build_source_version: "stable/pike"
# URL of IPA upper constraints file. # URL of IPA upper constraints file.
ipa_build_upper_constraints_file_url: ipa_build_upper_constraints_file_url:
@ -63,13 +63,13 @@ ipa_build_dib_git_elements: []
ipa_images_kernel_name: "ipa.vmlinuz" ipa_images_kernel_name: "ipa.vmlinuz"
# URL of Ironic deployment kernel image to download. # URL of Ironic deployment kernel image to download.
ipa_kernel_upstream_url: "https://tarballs.openstack.org/ironic-python-agent/coreos/files/coreos_production_pxe-stable-ocata.vmlinuz" ipa_kernel_upstream_url: "https://tarballs.openstack.org/ironic-python-agent/coreos/files/coreos_production_pxe-stable-pike.vmlinuz"
# Name of Ironic deployment ramdisk image to register in Glance. # Name of Ironic deployment ramdisk image to register in Glance.
ipa_images_ramdisk_name: "ipa.initramfs" ipa_images_ramdisk_name: "ipa.initramfs"
# URL of Ironic deployment ramdisk image to download. # URL of Ironic deployment ramdisk image to download.
ipa_ramdisk_upstream_url: "https://tarballs.openstack.org/ironic-python-agent/coreos/files/coreos_production_pxe_image-oem-stable-ocata.cpio.gz" ipa_ramdisk_upstream_url: "https://tarballs.openstack.org/ironic-python-agent/coreos/files/coreos_production_pxe_image-oem-stable-pike.cpio.gz"
############################################################################### ###############################################################################
# Ironic Python Agent (IPA) deployment configuration. # Ironic Python Agent (IPA) deployment configuration.

View File

@ -13,7 +13,7 @@ kolla_source_url: "https://github.com/stackhpc/kolla"
# Version (branch, tag, etc.) of Kolla source code repository if type is # Version (branch, tag, etc.) of Kolla source code repository if type is
# 'source'. # 'source'.
kolla_source_version: "stackhpc-{{ kolla_openstack_release }}" kolla_source_version: "stackhpc/pike"
# Path to virtualenv in which to install kolla. # Path to virtualenv in which to install kolla.
kolla_venv: "{{ virtualenv_path ~ '/kolla' }}" kolla_venv: "{{ virtualenv_path ~ '/kolla' }}"
@ -32,7 +32,7 @@ kolla_ansible_source_url: "https://github.com/stackhpc/kolla-ansible"
# Version (branch, tag, etc.) of Kolla Ansible source code repository if type # Version (branch, tag, etc.) of Kolla Ansible source code repository if type
# is 'source'. # is 'source'.
kolla_ansible_source_version: "stackhpc-{{ kolla_openstack_release }}" kolla_ansible_source_version: "stackhpc/pike"
# Path to virtualenv in which to install kolla-ansible. # Path to virtualenv in which to install kolla-ansible.
kolla_ansible_venv: "{{ lookup('env', 'KOLLA_VENV_PATH') | default(lookup('env', 'PWD') ~ '/venvs/kolla-ansible', true) }}" kolla_ansible_venv: "{{ lookup('env', 'KOLLA_VENV_PATH') | default(lookup('env', 'PWD') ~ '/venvs/kolla-ansible', true) }}"
@ -56,7 +56,7 @@ kolla_install_type: "binary"
kolla_docker_namespace: "stackhpc" kolla_docker_namespace: "stackhpc"
# Kolla OpenStack release version. This should be a Docker image tag. # Kolla OpenStack release version. This should be a Docker image tag.
kolla_openstack_release: "4.0.0.1" kolla_openstack_release: "5.0.0"
# Dict mapping names of sources to their definitions for # Dict mapping names of sources to their definitions for
# kolla_install_type=source. See kolla.common.config for details. # kolla_install_type=source. See kolla.common.config for details.