diff --git a/doc/source/openstack-health.rst b/doc/source/openstack-health.rst deleted file mode 100644 index e9ab695a8d..0000000000 --- a/doc/source/openstack-health.rst +++ /dev/null @@ -1,41 +0,0 @@ -:title: openstack-health - -.. _openstack-health: - -OpenStack-Health -################ - -At a Glance -=========== - -:Hosts: - * API Server: http://health.openstack.org - * Frontend: http://status.openstack.org/openstack-health -:Puppet: - * https://opendev.org/opendev/puppet-openstack_health/tree/ - * :git_file:`modules/openstack_project/manifests/openstack_health_api.pp` - * :git_file:`modules/openstack_project/manifests/status.pp` -:Configuration: - * :git_file:`modules/openstack_project/files/git/cgitrc` -:Projects: - * https://opendev.org/openstack/openstack-health - -Overview -======== - -The OpenStack Health dashboard provides a view of the status of all the tests -running in our continuous integration infrastructure that we collect results -data in subunit2sql for. It is composed of 2 pieces: - -#. The REST API that provides the data used for the dashboard visualizations -#. The JS frontend which is used to visualize the data returned by the REST - API - -The REST API is deployed on it's own server. It is written in python using flask -and is deployed using mod_wsgi under apache. - -The frontend component is deployed on status.openstack.org. - -Both components are continually deployed from the project repo, so as soon -as a commit lands in the openstack-health repo it will be applied to the -deployment. diff --git a/doc/source/systems.rst b/doc/source/systems.rst index 93e397f8e1..b6c7c75171 100644 --- a/doc/source/systems.rst +++ b/doc/source/systems.rst @@ -32,7 +32,6 @@ Major Systems kerberos afs translate - openstack-health refstack codesearch signing diff --git a/manifests/site.pp b/manifests/site.pp index 714a7f8268..c3220b1e35 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1,13 +1,3 @@ -# Node-OS: xenial -node /^health\d*\.openstack\.org$/ { - $group = "health" - class { 'openstack_project::server': } - class { 'openstack_project::openstack_health_api': - subunit2sql_db_host => hiera('subunit2sql_db_host', 'localhost'), - hostname => 'health.openstack.org', - } -} - # Node-OS: xenial node /^cacti\d+\.open.*\.org$/ { $group = "cacti" diff --git a/modules.env b/modules.env index 30e7037dc1..6d37e45ef8 100644 --- a/modules.env +++ b/modules.env @@ -68,7 +68,6 @@ INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-log_processor"]="origin/ INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-logrotate"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-logstash"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-mysql_backup"]="origin/master" -INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-openstack_health"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-pip"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-project_config"]="origin/master" # Ethercalc uses the redis module diff --git a/modules/openstack_project/manifests/openstack_health_api.pp b/modules/openstack_project/manifests/openstack_health_api.pp deleted file mode 100644 index e73c0f941e..0000000000 --- a/modules/openstack_project/manifests/openstack_health_api.pp +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2013 Hewlett-Packard Development Company, L.P. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# openstack-health api worker glue class. -# -class openstack_project::openstack_health_api ( - $subunit2sql_db_host = 'localhost', - $subunit2sql_db_user = 'query', - $subunit2sql_db_name = 'subunit2sql', - $subunit2sql_db_pass = 'query', - $hostname = $::fqdn, -) { - include 'openstack_health' - class { 'openstack_health::api': - db_uri => "mysql+pymysql://${subunit2sql_db_user}:${subunit2sql_db_pass}@${subunit2sql_db_host}/${subunit2sql_db_name}", - vhost_name => $hostname, - vhost_port => 80, - cache_expiration => 300, - } -} diff --git a/modules/openstack_project/manifests/status.pp b/modules/openstack_project/manifests/status.pp index 9133a1f759..70fa9cac54 100644 --- a/modules/openstack_project/manifests/status.pp +++ b/modules/openstack_project/manifests/status.pp @@ -12,7 +12,6 @@ class openstack_project::status ( $status_base_url = 'http://status.openstack.org', $status_title = 'OpenStack', $graphite_render_url = 'http://graphite.opendev.org/render/', - $openstack_health_api_endpoint = 'http://health.openstack.org', ) { include openstack_project @@ -176,13 +175,4 @@ class openstack_project::status ( reviewday_rsa_key_contents => $reviewday_ssh_private_key, } - ########################################################### - # Status - openstack-health - - include 'openstack_health' - - openstack_health::site { 'openstack-health': - httproot => '/srv/static/openstack-health', - api_endpoint => $openstack_health_api_endpoint - } } diff --git a/zuul.d/puppet.yaml b/zuul.d/puppet.yaml index 7835f8a182..b26182b368 100644 --- a/zuul.d/puppet.yaml +++ b/zuul.d/puppet.yaml @@ -20,7 +20,6 @@ - opendev/puppet-logrotate - opendev/puppet-logstash - opendev/puppet-mysql_backup - - opendev/puppet-openstack_health - opendev/puppet-openstack_infra_spec_helper - opendev/puppet-pip - opendev/puppet-project_config @@ -100,7 +99,6 @@ - opendev/puppet-logrotate - opendev/puppet-elasticsearch - opendev/puppet-storyboard - - opendev/puppet-openstack_health - opendev/puppet-log_processor - opendev/puppet-simpleproxy - opendev/puppet-bup