From 018a14e34f4d438c4c5b3f5e6f5284063eb08432 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 12 Mar 2021 13:48:38 +1100 Subject: [PATCH] refstack: cleanup old puppet Remove old puppet configuration for the restack service, which is now managed by Ansible. Change-Id: I6b6dfd0f8ef89a5362f64cfbc8016ba5b1a346b3 --- doc/source/refstack.rst | 17 +++++++++---- hiera/common.yaml | 1 + inventory/base/hosts.yaml | 7 ------ inventory/service/groups.yaml | 6 +---- .../host_vars/refstack.openstack.org.yaml | 1 - manifests/site.pp | 25 ------------------- playbooks/group_vars/certcheck.yaml | 1 - playbooks/service-refstack.yaml | 2 +- 8 files changed, 15 insertions(+), 45 deletions(-) delete mode 100644 inventory/service/host_vars/refstack.openstack.org.yaml diff --git a/doc/source/refstack.rst b/doc/source/refstack.rst index 32b3f40197..55745b9bb2 100644 --- a/doc/source/refstack.rst +++ b/doc/source/refstack.rst @@ -14,9 +14,10 @@ At a Glance =========== :Hosts: - * http://refstack.openstack.org/ -:Puppet: - * https://opendev.org/opendev/puppet-refstack/ + * refstack01.openstack.org +:Ansible: + * :git_file:`playbooks/service-refstack.yaml` + * :git_file:`docker/refstack/Dockerfile` :Projects: * https://opendev.org/osf/refstack/ :Bugs: @@ -27,6 +28,12 @@ Overview There are three major components in the Refstack server: +* Refstack-UI +* Refstack-API +* Database + +These run as two containers (UI/API and mariadb) on the host. + Refstack-UI ----------- @@ -41,8 +48,8 @@ interoperability test results. It also provides APIs to facilitate the uploading/retrieval of test data. Users can use the refstack-client tool to anonymously upload their data to the refstack.openstack.org site. -MySQL database --------------- +Mariadb database +---------------- This is the database to host the user uploaded test results data. diff --git a/hiera/common.yaml b/hiera/common.yaml index 2bddb47501..989394b30a 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -291,6 +291,7 @@ cacti_hosts: - mirror.us-east.openedge.opendev.org - mirror-update.opendev.org - mirror-update.openstack.org +- refstack01.openstack.org - review-dev01.opendev.org - review.openstack.org - static01.opendev.org diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml index 7a6c4197e8..7bc17a7fc3 100644 --- a/inventory/base/hosts.yaml +++ b/inventory/base/hosts.yaml @@ -634,13 +634,6 @@ all: region_name: ca-ymq-1 public_v4: 199.204.45.22 public_v6: 2604:e100:1:0:f816:3eff:fe05:7ce0 - refstack.openstack.org: - ansible_host: 23.253.230.186 - location: - cloud: openstackci-rax - region_name: DFW - public_v4: 23.253.230.186 - public_v6: 2001:4800:7817:103:be76:4eff:fe05:5870 refstack01.openstack.org: ansible_host: 104.239.144.250 location: diff --git a/inventory/service/groups.yaml b/inventory/service/groups.yaml index 97a2119e1a..d7ddd2dc9f 100644 --- a/inventory/service/groups.yaml +++ b/inventory/service/groups.yaml @@ -141,7 +141,6 @@ groups: - paste[0-9]*.open*.org - pbx[0-9]*.opendev.org - planet[0-9]*.open*.org - - refstack.openstack.org - status*.open*.org - storyboard-dev[0-9]*.opendev.org - storyboard[0-9]*.opendev.org @@ -172,7 +171,6 @@ groups: - paste[0-9]*.open*.org - pbx[0-9]*.opendev.org - planet[0-9]*.open*.org - - refstack.openstack.org - status*.open*.org - storyboard[0-9]*.opendev.org - storyboard-dev[0-9]*.opendev.org @@ -184,8 +182,6 @@ groups: - wiki-dev[0-9]*.openstack.org refstack: - refstack[0-9]*.openstack.org - refstack-docker: - - refstack[0-9]*.openstack.org registry: - insecure-ci-registry[0-9]*.opendev.org review-dev: @@ -226,7 +222,7 @@ groups: - openstackid[0-9]*.openstack.org - paste[0-9]*.open*.org - planet[0-9]*.open*.org - - refstack*.openstack.org + - refstack[0-9]*.openstack.org - static[0-9]*.opendev.org - status*.open*.org - storyboard-dev[0-9]*.opendev.org diff --git a/inventory/service/host_vars/refstack.openstack.org.yaml b/inventory/service/host_vars/refstack.openstack.org.yaml deleted file mode 100644 index 89224a3fb2..0000000000 --- a/inventory/service/host_vars/refstack.openstack.org.yaml +++ /dev/null @@ -1 +0,0 @@ -ansible_python_interpreter: python diff --git a/manifests/site.pp b/manifests/site.pp index 79e6942088..411f86db14 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -199,31 +199,6 @@ node /^firehose\d+\.open.*\.org$/ { } } -# Node-OS: trusty -# Node-OS: xenial -node /^refstack\d*\.open.*\.org$/ { - class { 'openstack_project::server': } - class { 'refstack': - mysql_host => hiera('refstack_mysql_host', 'localhost'), - mysql_database => hiera('refstack_mysql_db_name', 'refstack'), - mysql_user => hiera('refstack_mysql_user', 'refstack'), - mysql_user_password => hiera('refstack_mysql_password'), - ssl_cert_content => hiera('refstack_ssl_cert_file_contents'), - ssl_cert => '/etc/ssl/certs/refstack.pem', - ssl_key_content => hiera('refstack_ssl_key_file_contents'), - ssl_key => '/etc/ssl/private/refstack.key', - ssl_ca_content => hiera('refstack_ssl_chain_file_contents'), - ssl_ca => '/etc/ssl/certs/refstack.ca.pem', - protocol => 'https', - } - mysql_backup::backup_remote { 'refstack': - database_host => hiera('refstack_mysql_host', 'localhost'), - database_user => hiera('refstack_mysql_user', 'refstack'), - database_password => hiera('refstack_mysql_password'), - require => Class['::refstack'], - } -} - # A machine to run Storyboard # Node-OS: xenial node /^storyboard\d+\.opendev\.org$/ { diff --git a/playbooks/group_vars/certcheck.yaml b/playbooks/group_vars/certcheck.yaml index 1e176b273d..d077aac519 100644 --- a/playbooks/group_vars/certcheck.yaml +++ b/playbooks/group_vars/certcheck.yaml @@ -6,7 +6,6 @@ letsencrypt_certcheck_additional_domains: - git.openstack.org 443 - openstackid-dev.openstack.org 443 - openstackid.org 443 - - refstack.openstack.org 443 - review.openstack.org 443 - storyboard.openstack.org 443 - survey.openstack.org 443 diff --git a/playbooks/service-refstack.yaml b/playbooks/service-refstack.yaml index 68a76d9650..12f5fe53b1 100644 --- a/playbooks/service-refstack.yaml +++ b/playbooks/service-refstack.yaml @@ -1,4 +1,4 @@ -- hosts: "refstack-docker:!disabled" +- hosts: "refstack:!disabled" name: "Configure refstack service in docker" roles: - install-docker