From f008b6a675cf5805185ceb9446443a2366f08b0b Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Thu, 14 Sep 2017 15:21:03 +0100 Subject: [PATCH] Update software dependencies to pike releases For kolla, kolla-ansible and bifrost, we are now using a stackhpc/ 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. --- ansible/group_vars/all/bifrost | 2 +- ansible/group_vars/all/ipa | 6 +++--- ansible/group_vars/all/kolla | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ansible/group_vars/all/bifrost b/ansible/group_vars/all/bifrost index 7dd1a5e29..2bc4ba529 100644 --- a/ansible/group_vars/all/bifrost +++ b/ansible/group_vars/all/bifrost @@ -8,7 +8,7 @@ kolla_bifrost_source_url: "https://github.com/stackhpc/bifrost" # 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. diff --git a/ansible/group_vars/all/ipa b/ansible/group_vars/all/ipa index 05a266458..d505caf05 100644 --- a/ansible/group_vars/all/ipa +++ b/ansible/group_vars/all/ipa @@ -11,7 +11,7 @@ ipa_build_images: False ipa_build_source_url: "https://github.com/openstack/ironic-python-agent" # Version of IPA source repository. -ipa_build_source_version: "stable/ocata" +ipa_build_source_version: "stable/pike" # URL of IPA upper constraints file. ipa_build_upper_constraints_file_url: @@ -63,13 +63,13 @@ ipa_build_dib_git_elements: [] ipa_images_kernel_name: "ipa.vmlinuz" # 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. ipa_images_ramdisk_name: "ipa.initramfs" # 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. diff --git a/ansible/group_vars/all/kolla b/ansible/group_vars/all/kolla index 1087ed51c..468c609b5 100644 --- a/ansible/group_vars/all/kolla +++ b/ansible/group_vars/all/kolla @@ -13,7 +13,7 @@ kolla_source_url: "https://github.com/stackhpc/kolla" # Version (branch, tag, etc.) of Kolla source code repository if type is # 'source'. -kolla_source_version: "stackhpc-{{ kolla_openstack_release }}" +kolla_source_version: "stackhpc/pike" # Path to virtualenv in which to install 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 # 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. 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 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 # kolla_install_type=source. See kolla.common.config for details.