tcib: move cradox to gnocchi-base & enable ci on scenario001

gnocchi-db-sync requires cradox to be installed if RBD backend is used.
Until we fix it properly in the distgit, let's make sure cradox is in
the base image for gnocchi. It also requires httpd and deps for the
dv_sync to operate when Ceph is installed.

With that patch, we can now test container builds on scenario001.

Note: adding panko-api container image, required in Train.

Change-Id: Id13028ab911ba91d67787ca8247effc02017fcbc
(cherry picked from commit 7ecc263401)
(cherry picked from commit 55573ec43f)
This commit is contained in:
Emilien Macchi 2020-06-10 11:09:44 -04:00
parent 5397e9eb4f
commit 365bfd518f
6 changed files with 37 additions and 6 deletions

View File

@ -61,6 +61,7 @@ _SUPPORTED_USERS['nova']='nova 42436 42436 /var/lib/nova qemu,libvirt,kolla'
_SUPPORTED_USERS['novajoin']='novajoin 42470 42470 /var/lib/novajoin kolla'
_SUPPORTED_USERS['octavia']='octavia 42437 42437 /var/lib/octavia kolla'
_SUPPORTED_USERS['openvswitch']='openvswitch 42476 42476'
_SUPPORTED_USERS['panko']='panko 42438 42438 /var/lib/panko ceilometer,kolla'
_SUPPORTED_USERS['placement']='placement 42482 42482 /var/lib/placement kolla'
_SUPPORTED_USERS['qdrouterd']='qdrouterd 42465 42465 /var/lib/qdrouterd kolla'
_SUPPORTED_USERS['qemu']='qemu 42427 42427'

View File

@ -5,9 +5,3 @@ tcib_actions:
tcib_packages:
common:
- gnocchi-api
- httpd
- mod_ssl
- python3-boto3
- python3-cradox
- python3-ldappool
- python3-mod_wsgi

View File

@ -4,3 +4,10 @@ tcib_actions:
tcib_packages:
common:
- gnocchi-common
- python3-cradox
- python3-eventlet
- httpd
- mod_ssl
- python3-boto3
- python3-ldappool
- python3-mod_wsgi

View File

@ -0,0 +1,12 @@
tcib_actions:
- run: bash /usr/local/bin/uid_gid_manage ceilometer {{ tcib_user }}
- run: dnf -y install {{ tcib_packages.common | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
- run: sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
- run: ln -s /usr/share/openstack-tripleo-common/healthcheck/panko-api /openstack/healthcheck && chmod a+rx /openstack/healthcheck
tcib_packages:
common:
- httpd
- mod_ssl
- openstack-panko-api
- python3-ldappool
- python3-mod_wsgi

View File

@ -191,6 +191,8 @@ container_images:
imagename: quay.io/tripleotrain/openstack-ovn-nb-db-server:current-tripleo
- image_source: tripleo
imagename: quay.io/tripleotrain/openstack-ovn-sb-db-server:current-tripleo
- image_source: tripleo
imagename: quay.io/tripleotrain/openstack-panko-api:current-tripleo
- image_source: tripleo
imagename: quay.io/tripleotrain/openstack-placement-api:current-tripleo
- image_source: tripleo

View File

@ -53,6 +53,21 @@
dependencies: *deps_unit_lint
- tripleo-ci-centos-8-scenario001-standalone:
dependencies: *deps_unit_lint
- tripleo-ci-centos-8-scenario001-standalone:
dependencies: *deps_unit_lint
vars:
build_container_images: true
files:
- ^container-images/tcib/base/collectd.*$
- ^container-images/tcib/base/os/aodh.*$
- ^container-images/tcib/base/os/ceilometer.*$
- ^container-images/tcib/base/os/cinder.*$
- ^container-images/tcib/base/os/gnocchi.*$
- ^container-images/tcib/base/os/heat.*$
- ^container-images/tcib/base/os/panko.*$
- ^container-images/tcib/base/qdrouterd.*$
- ^container-images/tcib/base/rabbitmq.*$
- ^container-images/tcib/base/redis.*$
- tripleo-ci-centos-8-scenario002-standalone:
dependencies: *deps_unit_lint
- tripleo-ci-centos-8-scenario003-standalone: