Fix tempest test skip on horizon

Change-Id: I562e347ad573a02575ddc61fd6ece00f4ede16bc
This commit is contained in:
okozachenko 2020-07-14 00:54:24 +03:00
parent abba4d237f
commit c4a743073e
4 changed files with 70 additions and 0 deletions

60
devstack/lib/horizon Normal file
View File

@ -0,0 +1,60 @@
#!/bin/bash
#
# lib/horizon
# Functions to control the configuration and operation of the horizon service
# Dependencies:
#
# - ``functions`` file
# - ``apache`` file
# - ``SERVICE_{TENANT_NAME|PASSWORD}`` must be defined
# ``stack.sh`` calls the entry points in this order:
#
# - install_horizon
# - configure_horizon
# - init_horizon
# - start_horizon
# - stop_horizon
# - cleanup_horizon
# Save trace setting
_XTRACE_HORIZON=$(set +o | grep xtrace)
set +o xtrace
# Functions
# ---------
# configure_horizon() - Set config files, create data dirs, etc
function configure_horizon {
echo noop
}
# init_horizon() - Initialize databases, etc.
function init_horizon {
echo noop
}
# install_horizon() - Collect source and prepare
function install_horizon {
echo noop
}
# start_horizon() - Start running processes
function start_horizon {
kubectl rollout restart statefulset/memcached-horizon
sleep 10
}
# stop_horizon() - Stop running processes
function stop_horizon {
stop_apache_server
}
# Restore xtrace
$_XTRACE_HORIZON
# Tell emacs to use shell-script-mode
## Local variables:
## mode: shell-script
## End:

View File

@ -40,6 +40,13 @@ elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
:
elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then
# Horizon dashboard Url in tempest_horizon
if is_service_enabled tempest; then
local ip=$(get_kubernetes_service_ip horizon)
iniset $TEMPEST_CONFIG dashboard dashboard_url http://$ip
fi
fi
if [[ "$1" == "unstack" ]]; then

View File

@ -18,4 +18,5 @@ define_plugin openstack-operator
source $DEST/openstack-operator/devstack/lib/common
source $DEST/openstack-operator/devstack/lib/glance
source $DEST/openstack-operator/devstack/lib/horizon
source $DEST/openstack-operator/devstack/lib/keystone

View File

@ -11,10 +11,12 @@
- openstack/heat-tempest-plugin
- openstack/magnum
- openstack/magnum-tempest-plugin
- openstack/horizon
- openstack/tempest-horizon
vars:
devstack_services:
etcd3: false
horizon: true
rabbit: false
tls-proxy: false
devstack_plugins: