Trove: Use trove::db to set up database options
... because database options of the base trove class have been deprecated. Remove CentOS Stream 8 jobs RDO Zed (currently master) will only support CentOS Stream 9 [1]. The CS8 DLRN builder is about to be stopped and removed, so we can get rid of the CS8 jobs. Plus we need to require "six" explicitly. Until now, it was installed as transitive dependency. [1] https://lists.rdoproject.org/archives/list/dev@lists.rdoproject.org/thread/EKPN4RMQEKYS3ZAHRUHZQ47IF7QXOLZH/ Change-Id: Ib82083f328c3e23b07559652e31acb0153c61a43
This commit is contained in:
parent
edcd363dc6
commit
6f9aedc4a3
81
.zuul.yaml
81
.zuul.yaml
|
@ -32,34 +32,6 @@
|
||||||
- openstack/puppet-trove
|
- openstack/puppet-trove
|
||||||
- openstack/puppet-vswitch
|
- openstack/puppet-vswitch
|
||||||
|
|
||||||
- job:
|
|
||||||
name: packstack-centos8
|
|
||||||
parent: packstack-base
|
|
||||||
vars:
|
|
||||||
selinux_enforcing: "false"
|
|
||||||
delorean: "https://trunk.rdoproject.org/centos8-master/puppet-passed-ci/delorean.repo"
|
|
||||||
delorean_deps: "https://trunk.rdoproject.org/centos8-master/delorean-deps.repo"
|
|
||||||
pre-run: playbooks/packstack-centos8-pre.yaml
|
|
||||||
nodeset:
|
|
||||||
nodes:
|
|
||||||
- name: centos8s
|
|
||||||
label: centos-8-stream
|
|
||||||
run: playbooks/packstack-integration-tempest.yaml
|
|
||||||
|
|
||||||
- job:
|
|
||||||
name: packstack-centos8s
|
|
||||||
parent: packstack-base
|
|
||||||
vars:
|
|
||||||
selinux_enforcing: "false"
|
|
||||||
delorean: "https://trunk.rdoproject.org/centos8-master/puppet-passed-ci/delorean.repo"
|
|
||||||
delorean_deps: "https://trunk.rdoproject.org/centos8-master/delorean-deps.repo"
|
|
||||||
pre-run: playbooks/packstack-centos8-pre.yaml
|
|
||||||
nodeset:
|
|
||||||
nodes:
|
|
||||||
- name: centos8s
|
|
||||||
label: centos-8-stream
|
|
||||||
run: playbooks/packstack-integration-tempest.yaml
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: packstack-centos9
|
name: packstack-centos9
|
||||||
parent: packstack-base
|
parent: packstack-base
|
||||||
|
@ -74,22 +46,6 @@
|
||||||
label: centos-9-stream
|
label: centos-9-stream
|
||||||
run: playbooks/packstack-integration-tempest.yaml
|
run: playbooks/packstack-integration-tempest.yaml
|
||||||
|
|
||||||
- job:
|
|
||||||
name: packstack-multinode-centos8s
|
|
||||||
parent: packstack-base
|
|
||||||
vars:
|
|
||||||
selinux_enforcing: "false"
|
|
||||||
delorean: "https://trunk.rdoproject.org/centos8-master/puppet-passed-ci/delorean.repo"
|
|
||||||
delorean_deps: "https://trunk.rdoproject.org/centos8-master/delorean-deps.repo"
|
|
||||||
pre-run: playbooks/packstack-centos8-pre.yaml
|
|
||||||
nodeset:
|
|
||||||
nodes:
|
|
||||||
- name: controller
|
|
||||||
label: centos-8-stream
|
|
||||||
- name: compute
|
|
||||||
label: centos-8-stream
|
|
||||||
run: playbooks/packstack-multinode.yaml
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: packstack-multinode-centos9
|
name: packstack-multinode-centos9
|
||||||
parent: packstack-base
|
parent: packstack-base
|
||||||
|
@ -107,31 +63,6 @@
|
||||||
label: centos-9-stream
|
label: centos-9-stream
|
||||||
run: playbooks/packstack-multinode.yaml
|
run: playbooks/packstack-multinode.yaml
|
||||||
|
|
||||||
- job:
|
|
||||||
name: packstack-centos8s-integration-scenario001
|
|
||||||
parent: packstack-centos8s
|
|
||||||
vars:
|
|
||||||
scenario: scenario001
|
|
||||||
|
|
||||||
- job:
|
|
||||||
name: packstack-centos8s-integration-scenario002
|
|
||||||
parent: packstack-centos8s
|
|
||||||
vars:
|
|
||||||
scenario: scenario002
|
|
||||||
|
|
||||||
- job:
|
|
||||||
name: packstack-centos8s-integration-scenario003
|
|
||||||
parent: packstack-centos8s
|
|
||||||
vars:
|
|
||||||
scenario: scenario003
|
|
||||||
|
|
||||||
- job:
|
|
||||||
name: packstack-centos8s-multinode-scenario002-tempest
|
|
||||||
parent: packstack-multinode-centos8s
|
|
||||||
post-run: playbooks/packstack-post-compute.yaml
|
|
||||||
vars:
|
|
||||||
scenario: scenario002
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: packstack-centos9s-integration-scenario001
|
name: packstack-centos9s-integration-scenario001
|
||||||
parent: packstack-centos9
|
parent: packstack-centos9
|
||||||
|
@ -245,10 +176,6 @@
|
||||||
- build-openstack-releasenotes:
|
- build-openstack-releasenotes:
|
||||||
vars:
|
vars:
|
||||||
sphinx_python: python3
|
sphinx_python: python3
|
||||||
- packstack-centos8s-integration-scenario001
|
|
||||||
- packstack-centos8s-integration-scenario002
|
|
||||||
- packstack-centos8s-integration-scenario003
|
|
||||||
- packstack-centos8s-multinode-scenario002-tempest
|
|
||||||
- packstack-centos9s-integration-scenario001
|
- packstack-centos9s-integration-scenario001
|
||||||
- packstack-centos9s-integration-scenario002
|
- packstack-centos9s-integration-scenario002
|
||||||
- packstack-centos9s-integration-scenario003
|
- packstack-centos9s-integration-scenario003
|
||||||
|
@ -260,10 +187,10 @@
|
||||||
- build-openstack-releasenotes:
|
- build-openstack-releasenotes:
|
||||||
vars:
|
vars:
|
||||||
sphinx_python: python3
|
sphinx_python: python3
|
||||||
- packstack-centos8s-integration-scenario001
|
- packstack-centos9s-integration-scenario001
|
||||||
- packstack-centos8s-integration-scenario002
|
- packstack-centos9s-integration-scenario002
|
||||||
- packstack-centos8s-integration-scenario003
|
- packstack-centos9s-integration-scenario003
|
||||||
- packstack-centos8s-multinode-scenario002-tempest
|
- packstack-centos9s-multinode-scenario002-tempest
|
||||||
post:
|
post:
|
||||||
jobs:
|
jobs:
|
||||||
- packstack-upload-git-mirror
|
- packstack-upload-git-mirror
|
||||||
|
|
|
@ -24,10 +24,13 @@ class packstack::trove::rabbitmq ()
|
||||||
}
|
}
|
||||||
Service<| name == 'rabbitmq-server' |> -> Service<| tag == 'trove-service' |>
|
Service<| name == 'rabbitmq-server' |> -> Service<| tag == 'trove-service' |>
|
||||||
|
|
||||||
|
class { 'trove::db':
|
||||||
|
database_connection => "mysql+pymysql://trove:${trove_rabmq_cfg_trove_db_pw}@${trove_rabmq_cfg_mariadb_host}/trove",
|
||||||
|
}
|
||||||
|
|
||||||
class { 'trove':
|
class { 'trove':
|
||||||
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),
|
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),
|
||||||
default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
|
default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
|
||||||
database_connection => "mysql+pymysql://trove:${trove_rabmq_cfg_trove_db_pw}@${trove_rabmq_cfg_mariadb_host}/trove",
|
|
||||||
kombu_ssl_ca_certs => $kombu_ssl_ca_certs,
|
kombu_ssl_ca_certs => $kombu_ssl_ca_certs,
|
||||||
kombu_ssl_keyfile => $kombu_ssl_keyfile,
|
kombu_ssl_keyfile => $kombu_ssl_keyfile,
|
||||||
kombu_ssl_certfile => $kombu_ssl_certfile,
|
kombu_ssl_certfile => $kombu_ssl_certfile,
|
||||||
|
|
|
@ -1,28 +0,0 @@
|
||||||
- hosts: all
|
|
||||||
name: packstack-centos8-pre
|
|
||||||
tasks:
|
|
||||||
- name: Ensure legacy workspace directory
|
|
||||||
file:
|
|
||||||
path: '{{ ansible_user_dir }}/workspace'
|
|
||||||
state: directory
|
|
||||||
|
|
||||||
- shell:
|
|
||||||
cmd: |
|
|
||||||
cp -pr /home/zuul/src/opendev.org/x/packstack {{ ansible_user_dir }}/workspace
|
|
||||||
|
|
||||||
- shell:
|
|
||||||
cmd: |
|
|
||||||
set -e
|
|
||||||
set -x
|
|
||||||
rm -rf /etc/yum.repos.d/delorean*
|
|
||||||
# Remove epel repos and release rpms
|
|
||||||
rm -rf /etc/yum.repos.d/epel* && dnf remove -y epel*
|
|
||||||
dnf clean all
|
|
||||||
sudo sed -i '/^exclude.*/d' /etc/dnf/dnf.conf
|
|
||||||
dnf -y install libxml2-devel libxslt-devel ruby-devel zlib-devel
|
|
||||||
dnf -y install gcc gettext diffstat doxygen patch patchutils subversion systemtap git python3-setuptools wget redhat-lsb-core python3-libselinux virt-what yum
|
|
||||||
pip uninstall requests -y || true
|
|
||||||
executable: /bin/bash
|
|
||||||
chdir: '{{ ansible_user_dir }}/workspace'
|
|
||||||
become: true
|
|
||||||
environment: '{{ zuul }}'
|
|
|
@ -5,3 +5,4 @@ docutils>=0.11
|
||||||
pyOpenSSL>=16.2.0
|
pyOpenSSL>=16.2.0
|
||||||
netifaces
|
netifaces
|
||||||
distro
|
distro
|
||||||
|
six
|
||||||
|
|
Loading…
Reference in New Issue