openstack/kayobe
Code Issues Proposed changes

Update dependencies to Rocky

Browse Source 
Use stable/rocky branch of:

* Kolla
* Kolla ansible
* Bifrost
* IPA
* OpenStack services
* Requirements

Also updates Kolla Ansible inventory template.

The seed deploy job has been made non-voting and non-gating, because we
are waiting for bifrost change https://review.openstack.org/#/c/618740
to merge, be released, and for the kolla bifrost image to use the new
package.

Change-Id: Id5e7fdbd196f96e1e75ffc68bc93aab18fa38aa7
Story: 2001864
Task: 27798
Depends-On: I58e4f951d4a3dd89e0784fd82d8a62dbba374f79
This commit is contained in:
Mark Goddard 2018-04-18 19:05:08 +01:00
parent 928efdca40
commit 935d3cef6a
14 changed files with 102 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/group_vars/all/bifrost
View File

@ -8,7 +8,7 @@
kolla_bifrost_source_url: "https://git.openstack.org/openstack/bifrost" kolla_bifrost_source_url: "https://git.openstack.org/openstack/bifrost"
# Version (branch, tag, etc.) of Bifrost source code repository. # Version (branch, tag, etc.) of Bifrost source code repository.
kolla_bifrost_source_version: "stable/queens" kolla_bifrost_source_version: "stable/rocky"
############################################################################### ###############################################################################
# Diskimage-builder configuration. # Diskimage-builder configuration.

6
ansible/group_vars/all/ipa
View File

@ -11,7 +11,7 @@ ipa_build_images: False
ipa_build_source_url: "https://git.openstack.org/openstack/ironic-python-agent" ipa_build_source_url: "https://git.openstack.org/openstack/ironic-python-agent"
# Version of IPA source repository. # Version of IPA source repository.
ipa_build_source_version: "stable/queens" ipa_build_source_version: "stable/rocky"
# 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,7 +63,7 @@ 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-queens.vmlinuz" ipa_kernel_upstream_url: "https://tarballs.openstack.org/ironic-python-agent/coreos/files/coreos_production_pxe-stable-rocky.vmlinuz"
# URL of checksum of Ironic deployment kernel image. # URL of checksum of Ironic deployment kernel image.
ipa_kernel_checksum_url: "{{ ipa_kernel_upstream_url }}.{{ ipa_kernel_checksum_algorithm }}" ipa_kernel_checksum_url: "{{ ipa_kernel_upstream_url }}.{{ ipa_kernel_checksum_algorithm }}"
@ -75,7 +75,7 @@ ipa_kernel_checksum_algorithm: "sha256"
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-queens.cpio.gz" ipa_ramdisk_upstream_url: "https://tarballs.openstack.org/ironic-python-agent/coreos/files/coreos_production_pxe_image-oem-stable-rocky.cpio.gz"
# URL of checksum of Ironic deployment ramdisk image. # URL of checksum of Ironic deployment ramdisk image.
ipa_ramdisk_checksum_url: "{{ ipa_ramdisk_upstream_url }}.{{ ipa_ramdisk_checksum_algorithm }}" ipa_ramdisk_checksum_url: "{{ ipa_ramdisk_upstream_url }}.{{ ipa_ramdisk_checksum_algorithm }}"

8
ansible/group_vars/all/kolla
View File

@ -13,7 +13,7 @@ kolla_source_url: "https://git.openstack.org/openstack/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: "stable/queens" kolla_source_version: "stable/rocky"
# 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' }}"
@ -35,7 +35,7 @@ kolla_ansible_source_url: "https://git.openstack.org/openstack/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: "stable/queens" kolla_ansible_source_version: "stable/rocky"
# 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) }}"
@ -71,7 +71,7 @@ kolla_docker_registry_username:
kolla_docker_registry_password: kolla_docker_registry_password:
# 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: "queens" kolla_openstack_release: "rocky"
# 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.
@ -315,7 +315,7 @@ kolla_enable_tls_external: "no"
kolla_openstack_logging_debug: "False" kolla_openstack_logging_debug: "False"
# Upper constraints file for installation of Kolla. # Upper constraints file for installation of Kolla.
kolla_upper_constraints_file: "https://raw.githubusercontent.com/openstack/requirements/stable/queens/upper-constraints.txt" kolla_upper_constraints_file: "https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/rocky"
# User account to use for Kolla SSH access. # User account to use for Kolla SSH access.
kolla_ansible_user: kolla kolla_ansible_user: kolla

5
ansible/roles/ironic-inspector-rules/library/os_ironic_inspector_rule.py
View File

@ -80,8 +80,9 @@ def _build_client(module):
"""Create and return an Ironic inspector client.""" """Create and return an Ironic inspector client."""
cloud = shade.operator_cloud(**module.params) cloud = shade.operator_cloud(**module.params)
session = cloud.cloud_config.get_session() session = cloud.cloud_config.get_session()
# API 1.12 is the latest API version available in Queens. # Ensure the requested API version is supported.
api_version = (1, 12) # API 1.14 is the latest API version available in Rocky.
api_version = (1, 14)
client = ironic_inspector_client.v1.ClientV1( client = ironic_inspector_client.v1.ClientV1(
inspector_url=module.params['inspector_url'], inspector_url=module.params['inspector_url'],
session=session, region_name=module.params['region_name'], session=session, region_name=module.params['region_name'],

50
ansible/roles/kolla-ansible/templates/overcloud-components.j2
View File

@ -37,6 +37,9 @@ compute
[influxdb:children] [influxdb:children]
monitoring monitoring
[prometheus:children]
monitoring
[kafka:children] [kafka:children]
control control
@ -81,6 +84,12 @@ control
[qdrouterd:children] [qdrouterd:children]
control control
[monasca:children]
monitoring
[storm:children]
monitoring
[mongodb:children] [mongodb:children]
control control
@ -128,12 +137,6 @@ control
[heat:children] [heat:children]
control control
[monasca:children]
monitoring
[storm:children]
monitoring
[murano:children] [murano:children]
control control
@ -170,35 +173,6 @@ control
[panko:children] [panko:children]
control control
[prometheus:children]
monitoring
[prometheus-alertmanager:children]
monitoring
[prometheus-node-exporter:children]
monitoring
control
compute
network
storage
[prometheus-mysqld-exporter:children]
mariadb
[prometheus-haproxy-exporter:children]
haproxy
[prometheus-memcached-exporter:children]
memcached
[prometheus-cadvisor:children]
monitoring
control
compute
network
storage
[gnocchi:children] [gnocchi:children]
control control
@ -242,6 +216,9 @@ control
[bifrost:children] [bifrost:children]
deployment deployment
[zookeeper:children]
control
[zun:children] [zun:children]
control control
@ -253,6 +230,3 @@ control
[blazar:children] [blazar:children]
control control
[zookeeper:children]
control

54
ansible/roles/kolla-ansible/templates/overcloud-services.j2
View File

@ -67,10 +67,10 @@ neutron
[neutron-metadata-agent:children] [neutron-metadata-agent:children]
neutron neutron
[neutron-vpnaas-agent:children] [neutron-bgp-dragent:children]
neutron neutron
[neutron-bgp-dragent:children] [neutron-infoblox-ipam-agent:children]
neutron neutron
[ironic-neutron-agent:children] [ironic-neutron-agent:children]
@ -119,11 +119,14 @@ cloudkitty
[freezer-api:children] [freezer-api:children]
freezer freezer
[freezer-scheduler:children]
freezer
# iSCSI # iSCSI
[iscsid:children] [iscsid:children]
compute compute
storage storage
ironic-conductor ironic
[tgtd:children] [tgtd:children]
storage storage
@ -184,6 +187,13 @@ heat
[heat-engine:children] [heat-engine:children]
heat heat
# Murano
[murano-api:children]
murano
[murano-engine:children]
murano
# Monasca # Monasca
[monasca-api:children] [monasca-api:children]
monasca monasca
@ -216,13 +226,6 @@ storm
[storm-nimbus:children] [storm-nimbus:children]
storm storm
# Murano
[murano-api:children]
murano
[murano-engine:children]
murano
# Ironic # Ironic
[ironic-api:children] [ironic-api:children]
ironic ironic
@ -344,6 +347,7 @@ trove
# Multipathd # Multipathd
[multipathd:children] [multipathd:children]
compute compute
storage
# Watcher # Watcher
[watcher-api:children] [watcher-api:children]
@ -412,6 +416,9 @@ placement
[zun-api:children] [zun-api:children]
zun zun
[zun-wsproxy:children]
zun
[zun-compute:children] [zun-compute:children]
compute compute
@ -452,3 +459,30 @@ blazar
[blazar-manager:children] [blazar-manager:children]
blazar blazar
# Prometheus
[prometheus-node-exporter:children]
monitoring
control
compute
network
storage
[prometheus-mysqld-exporter:children]
mariadb
[prometheus-haproxy-exporter:children]
haproxy
[prometheus-memcached-exporter:children]
memcached
[prometheus-cadvisor:children]
monitoring
control
compute
network
storage
[prometheus-alertmanager:children]
monitoring

6
dev/functions
View File

@ -212,6 +212,12 @@ function overcloud_deploy {
echo "Configuring the controller host" echo "Configuring the controller host"
run_kayobe overcloud host configure run_kayobe overcloud host configure
# FIXME(mgoddard): Perform host upgrade workarounds to ensure hostname
# resolves to IP address of API interface for RabbitMQ. This seems to be
# required since https://review.openstack.org/#/c/584427 was merged.
echo "Workaround: upgrading the controller host"
run_kayobe overcloud host upgrade
# Note: This must currently be before host configure, because host # Note: This must currently be before host configure, because host
# configure runs kolla-ansible.yml, which validates the presence of the # configure runs kolla-ansible.yml, which validates the presence of the
# built deploy images. # built deploy images.

10
playbooks/kayobe-overcloud-upgrade-base/globals.yml.j2
View File

@ -1,10 +0,0 @@
---
# The Queens kayobe configuration uses the fernet token provider. To avoid
# issues during upgrade, set the provider to fernet in the Pike deployment
# also.
keystone_token_provider: 'fernet'
# Most development environments will use nested virtualisation, and we can't
# guarantee that nested KVM support is available. Use QEMU as a lowest common
# denominator.
nova_compute_virt_type: qemu

5
playbooks/kayobe-overcloud-upgrade-base/pre.yml
View File

@ -53,11 +53,6 @@
vars: vars:
previous_release: true previous_release: true
- name: Ensure kayobe-config globals.yml config file exists
template:
src: globals.yml.j2
dest: "{{ previous_kayobe_config_src_dir }}/etc/kayobe/kolla/globals.yml"
# NOTE(mgoddard): The kayobe dev config by default expects a bridge - # NOTE(mgoddard): The kayobe dev config by default expects a bridge -
# breth1 - to exist with an IP address of 192.168.33.3. # breth1 - to exist with an IP address of 192.168.33.3.
- name: Ensure all-in-one network bridge interface exists - name: Ensure all-in-one network bridge interface exists

4
playbooks/kayobe-overcloud-upgrade-base/run.yml
View File

@ -54,9 +54,7 @@
- name: Perform testing of the overcloud prior to upgrade - name: Perform testing of the overcloud prior to upgrade
shell: shell:
cmd: dev/overcloud-test.sh > {{ logs_dir }}/ansible/overcloud-test-pre-upgrade cmd: dev/overcloud-test.sh > {{ logs_dir }}/ansible/overcloud-test-pre-upgrade
# NOTE(mgoddard): Currently need to use the new kayobe repo for chdir: "{{ previous_kayobe_src_dir }}"
# testing, since the overcloud-test.sh script is not available in Pike.
chdir: "{{ kayobe_src_dir }}"
# Upgrade Kayobe, and use it to perform an upgrade of the control plane. # Upgrade Kayobe, and use it to perform an upgrade of the control plane.

4
releasenotes/notes/rocky-355875d3f38b0d02.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- |
Updates dependencies to use the OpenStack Rocky release.

8
tox.ini
View File

@ -18,7 +18,7 @@ setenv =
OS_STDERR_CAPTURE=1 OS_STDERR_CAPTURE=1
OS_TEST_TIMEOUT=60 OS_TEST_TIMEOUT=60
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/queens} -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/rocky}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
commands = stestr run {posargs} commands = stestr run {posargs}
@ -36,7 +36,7 @@ commands =
[testenv:venv] [testenv:venv]
basepython = python3 basepython = python3
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/queens} -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/rocky}
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = {posargs} commands = {posargs}
@ -108,7 +108,7 @@ commands =
[testenv:docs] [testenv:docs]
basepython = python3 basepython = python3
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/queens} -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/rocky}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = sphinx-build -W -b html doc/source doc/build/html commands = sphinx-build -W -b html doc/source doc/build/html
@ -120,7 +120,7 @@ commands = oslo_debug_helper {posargs}
[testenv:releasenotes] [testenv:releasenotes]
basepython = python3 basepython = python3
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/queens} -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/rocky}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = commands =

22
zuul.d/jobs.yaml
View File

@ -34,7 +34,7 @@
timeout: 3600 timeout: 3600
required-projects: required-projects:
- name: openstack/requirements - name: openstack/requirements
override-checkout: stable/queens override-checkout: stable/rocky
vars: vars:
tox_envlist: molecule tox_envlist: molecule
irrelevant-files: irrelevant-files:
@ -59,11 +59,11 @@
- name: openstack/kayobe - name: openstack/kayobe
- name: openstack/kayobe-config-dev - name: openstack/kayobe-config-dev
- name: openstack/kolla - name: openstack/kolla
override-checkout: stable/queens override-checkout: stable/rocky
- name: openstack/kolla-ansible - name: openstack/kolla-ansible
override-checkout: stable/queens override-checkout: stable/rocky
- name: openstack/requirements - name: openstack/requirements
override-checkout: stable/queens override-checkout: stable/rocky
irrelevant-files: irrelevant-files:
- ^.*\.rst$ - ^.*\.rst$
- ^doc/.* - ^doc/.*
@ -94,14 +94,14 @@
- name: openstack/kayobe - name: openstack/kayobe
- name: openstack/kayobe-config-dev - name: openstack/kayobe-config-dev
- name: openstack/kolla - name: openstack/kolla
override-checkout: stable/queens override-checkout: stable/rocky
- name: openstack/kolla-ansible - name: openstack/kolla-ansible
override-checkout: stable/queens override-checkout: stable/rocky
- name: openstack/requirements - name: openstack/requirements
override-checkout: stable/queens override-checkout: stable/rocky
vars: vars:
# Name of the release to upgrade from. # Name of the release to upgrade from.
previous_release: pike previous_release: queens
irrelevant-files: irrelevant-files:
- ^.*\.rst$ - ^.*\.rst$
- ^doc/.* - ^doc/.*
@ -131,11 +131,11 @@
- name: openstack/kayobe - name: openstack/kayobe
- name: openstack/kayobe-config-dev - name: openstack/kayobe-config-dev
- name: openstack/kolla - name: openstack/kolla
override-checkout: stable/queens override-checkout: stable/rocky
- name: openstack/kolla-ansible - name: openstack/kolla-ansible
override-checkout: stable/queens override-checkout: stable/rocky
- name: openstack/requirements - name: openstack/requirements
override-checkout: stable/queens override-checkout: stable/rocky
irrelevant-files: irrelevant-files:
- ^.*\.rst$ - ^.*\.rst$
- ^doc/.* - ^doc/.*

11
zuul.d/project.yaml
View File

@ -16,7 +16,11 @@
- kayobe-tox-molecule - kayobe-tox-molecule
- kayobe-overcloud-centos - kayobe-overcloud-centos
- kayobe-overcloud-upgrade-centos - kayobe-overcloud-upgrade-centos
- kayobe-seed-centos # TODO(mgoddard): make this voting again when
# https://review.openstack.org/#/c/618740 has merged, been released,
# and the kolla bifrost image uses the new package.
- kayobe-seed-centos:
voting: false
gate: gate:
queue: kayobe queue: kayobe
@ -27,4 +31,7 @@
- kayobe-tox-molecule - kayobe-tox-molecule
- kayobe-overcloud-centos - kayobe-overcloud-centos
- kayobe-overcloud-upgrade-centos - kayobe-overcloud-upgrade-centos
- kayobe-seed-centos # TODO(mgoddard): make this gating again when
# https://review.openstack.org/#/c/618740 has merged, been released,
# and the kolla bifrost image uses the new package.
# - kayobe-seed-centos