diff --git a/.zuul.yaml b/.zuul.yaml index 2811f6610..01c1dd14f 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -23,6 +23,17 @@ - openstack/murano-tempest-plugin - openstack/telemetry-tempest-plugin - openstack/heat-tempest-plugin + - openstack/monasca-agent + - openstack/monasca-api + - openstack/monasca-common + - openstack/monasca-grafana-datasource + - openstack/monasca-notification + - openstack/monasca-persister + - openstack/monasca-statsd + - openstack/monasca-thresh + - openstack/monasca-ui + - openstack/python-monascaclient + - openstack/monasca-tempest-plugin run: playbooks/legacy/congress-devstack-api-base/run.yaml post-run: playbooks/legacy/congress-devstack-api-base/post.yaml timeout: 6000 diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 226ca9b73..0c03cd40c 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -74,6 +74,7 @@ function configure_congress_datasources { _configure_service cinder cinder _configure_service swift swift _configure_service glance glancev2 + _configure_service monasca monasca _configure_service murano murano _configure_service ironic ironic _configure_service heat heat @@ -93,7 +94,7 @@ function _configure_tempest { # set correctly due to different env setup scenario, so it is # better to set it explicitly here. local service - local required_services="heat,ironic,aodh,murano,mistral" + local required_services="heat,ironic,aodh,murano,mistral,monasca" for service in ${required_services//,/ }; do if is_service_enabled $service ; then iniset $TEMPEST_CONFIG service_available $service "True" diff --git a/playbooks/legacy/congress-devstack-api-base/run.yaml b/playbooks/legacy/congress-devstack-api-base/run.yaml index 480f844fc..c9f8b37af 100644 --- a/playbooks/legacy/congress-devstack-api-base/run.yaml +++ b/playbooks/legacy/congress-devstack-api-base/run.yaml @@ -34,12 +34,13 @@ enable_plugin murano git://git.openstack.org/openstack/murano enable_plugin aodh git://git.openstack.org/openstack/aodh enable_plugin mistral git://git.openstack.org/openstack/mistral + enable_plugin monasca-api git://git.openstack.org/openstack/monasca-api enable_plugin neutron https://git.openstack.org/openstack/neutron # To deploy congress as multi-process (api, pe, datasources) CONGRESS_MULTIPROCESS_DEPLOYMENT=True CONGRESS_EXPOSE_ENCRYPTION_KEY_FOR_TEST=True - TEMPEST_PLUGINS='/opt/stack/new/congress-tempest-plugin /opt/stack/new/telemetry-tempest-plugin /opt/stack/new/murano-tempest-plugin /opt/stack/new/heat-tempest-plugin /opt/stack/new/mistral-tempest-plugin' + TEMPEST_PLUGINS='/opt/stack/new/congress-tempest-plugin /opt/stack/new/telemetry-tempest-plugin /opt/stack/new/murano-tempest-plugin /opt/stack/new/heat-tempest-plugin /opt/stack/new/mistral-tempest-plugin /opt/stack/new/monasca-tempest-plugin' EOF executable: /bin/bash @@ -72,6 +73,17 @@ export PROJECTS="openstack/telemetry-tempest-plugin $PROJECTS" export PROJECTS="openstack/murano-tempest-plugin $PROJECTS" export PROJECTS="openstack/heat-tempest-plugin $PROJECTS" + export PROJECTS="openstack/monasca-api $PROJECTS" + export PROJECTS="openstack/monasca-persister $PROJECTS" + export PROJECTS="openstack/monasca-common $PROJECTS" + export PROJECTS="openstack/monasca-agent $PROJECTS" + export PROJECTS="openstack/monasca-notification $PROJECTS" + export PROJECTS="openstack/monasca-thresh $PROJECTS" + export PROJECTS="openstack/monasca-statsd $PROJECTS" + export PROJECTS="openstack/python-monascaclient $PROJECTS" + export PROJECTS="openstack/monasca-grafana-datasource $PROJECTS" + export PROJECTS="openstack/monasca-ui $PROJECTS" + export PROJECTS="openstack/monasca-tempest-plugin $PROJECTS" export ENABLED_SERVICES export BRANCH_OVERRIDE=default