Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[train][goal] Define new 'watcher-tempest-functional-ipv6-only' job"

Browse Source
This commit is contained in:
Zuul
2019-08-23 03:05:20 +00:00
committed by Gerrit Code Review
parent 1be3516d36 26cce968e9
commit 7289243624
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.zuul.yaml
View File

@@ -21,10 +21,12 @@
- watcher-tempest-host_maintenance - watcher-tempest-host_maintenance
- watcher-tempest-storage_balance - watcher-tempest-storage_balance
- watcher-tls-test - watcher-tls-test
- watcher-tempest-functional-ipv6-only
gate: gate:
queue: watcher queue: watcher
jobs: jobs:
- watcher-tempest-functional - watcher-tempest-functional
- watcher-tempest-functional-ipv6-only
- job: - job:
name: watcher-tempest-dummy_optim name: watcher-tempest-dummy_optim
@@ -161,7 +163,7 @@
name: watcher-tempest-functional name: watcher-tempest-functional
parent: devstack-tempest parent: devstack-tempest
timeout: 7200 timeout: 7200
required-projects: required-projects: &base_required_projects
- openstack/ceilometer - openstack/ceilometer
- openstack/devstack-gate - openstack/devstack-gate
- openstack/python-openstackclient - openstack/python-openstackclient
@@ -169,7 +171,7 @@
- openstack/watcher - openstack/watcher
- openstack/watcher-tempest-plugin - openstack/watcher-tempest-plugin
- openstack/tempest - openstack/tempest
vars: vars: &base_vars
devstack_plugins: devstack_plugins:
watcher: https://opendev.org/openstack/watcher watcher: https://opendev.org/openstack/watcher
devstack_services: devstack_services:
@@ -192,6 +194,14 @@
zuul_copy_output: zuul_copy_output:
/etc/hosts: logs /etc/hosts: logs
- job:
name: watcher-tempest-functional-ipv6-only
parent: devstack-tempest-ipv6
description: |
Watcher devstack tempest tests job for IPv6-only deployment
required-projects: *base_required_projects
vars: *base_vars
- job: - job:
name: watcher-grenade name: watcher-grenade
parent: legacy-dsvm-base parent: legacy-dsvm-base

6
devstack/lib/watcher
View File

@@ -193,15 +193,15 @@ function create_watcher_conf {
iniset_rpc_backend watcher $WATCHER_CONF iniset_rpc_backend watcher $WATCHER_CONF
iniset $WATCHER_CONF database connection $(database_connection_url watcher) iniset $WATCHER_CONF database connection $(database_connection_url watcher)
iniset $WATCHER_CONF api host "$WATCHER_SERVICE_HOST" iniset $WATCHER_CONF api host "$(ipv6_unquote $WATCHER_SERVICE_HOST)"
if is_service_enabled tls-proxy; then if is_service_enabled tls-proxy; then
iniset $WATCHER_CONF api host "$WATCHER_SERVICE_HOST" iniset $WATCHER_CONF api host "$(ipv6_unquote $WATCHER_SERVICE_HOST)"
iniset $WATCHER_CONF api port "$WATCHER_SERVICE_PORT_INT" iniset $WATCHER_CONF api port "$WATCHER_SERVICE_PORT_INT"
# iniset $WATCHER_CONF api enable_ssl_api "True" # iniset $WATCHER_CONF api enable_ssl_api "True"
else else
if [[ "$WATCHER_USE_WSGI_MODE" == "mod_wsgi" ]]; then if [[ "$WATCHER_USE_WSGI_MODE" == "mod_wsgi" ]]; then
iniset $WATCHER_CONF api host "$WATCHER_SERVICE_HOST" iniset $WATCHER_CONF api host "$(ipv6_unquote $WATCHER_SERVICE_HOST)"
iniset $WATCHER_CONF api port "$WATCHER_SERVICE_PORT" iniset $WATCHER_CONF api port "$WATCHER_SERVICE_PORT"
fi fi
fi fi