From 5e52befdfa980cb6c024632099a7c45a2d7b9eb6 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Thu, 15 Jul 2021 14:43:05 +1000 Subject: [PATCH] Remove paste01.openstack.org This has been replaced by paste01.opendev.org and Ansible deployment. Change-Id: I0f8f5374a3f5d269b317bde4ae2b37435e0871d5 --- doc/source/paste.rst | 21 ++++---------------- inventory/base/hosts.yaml | 7 ------- inventory/service/groups.yaml | 8 ++------ manifests/site.pp | 12 ----------- modules/openstack_project/manifests/paste.pp | 19 ------------------ playbooks/service-paste.yaml | 2 +- playbooks/test-paste.yaml | 2 +- 7 files changed, 8 insertions(+), 63 deletions(-) delete mode 100644 modules/openstack_project/manifests/paste.pp diff --git a/doc/source/paste.rst b/doc/source/paste.rst index 2378665ed5..163ca9861a 100644 --- a/doc/source/paste.rst +++ b/doc/source/paste.rst @@ -14,13 +14,11 @@ At a Glance =========== :Hosts: - * http://paste.openstack.org -:Puppet: - * https://opendev.org/opendev/puppet-lodgeit - * :git_file:`modules/openstack_project/manifests/paste.pp` + * http://paste.opendev.org +:Ansible: + * :git_file:`playbooks/roles/lodgeit/` :Projects: * https://opendev.org/opendev/lodgeit - * https://bitbucket.org/dcolish/lodgeit-main :Bugs: * https://storyboard.openstack.org/#!/project/748 @@ -33,16 +31,5 @@ based on one with bugfixes maintained by `dcolish `_ but adds back missing anti-spam features required by OpenStack. -Puppet configures lodgeit to use MySQL as a database backend, apache +Ansible configures lodgeit to use mariadb database backend, apache as a front-end proxy. - -The lodgeit module will automatically create a git repository in -``/var/backups/lodgeit_db``. Inside this every site will have its own -SQL file, for example "openstack" will have a file called -``openstack.sql``. Every day a cron job will update the SQL file (one -job per file) and commit it to the git repository. - -.. note:: - Ideally the SQL files would have a row on every line to keep the - diffs stored in git small, but ``mysqldump`` does not yet support - this. diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml index 95ec497486..f1242c7953 100644 --- a/inventory/base/hosts.yaml +++ b/inventory/base/hosts.yaml @@ -611,13 +611,6 @@ all: region_name: DFW public_v4: 104.130.159.12 public_v6: 2001:4800:7818:102:be76:4eff:fe04:673f - paste01.openstack.org: - ansible_host: 23.253.235.223 - location: - cloud: openstackci-rax - region_name: DFW - public_v4: 23.253.235.223 - public_v6: 2001:4800:7817:103:be76:4eff:fe05:176e paste01.opendev.org: ansible_host: 104.130.127.175 location: diff --git a/inventory/service/groups.yaml b/inventory/service/groups.yaml index a3146c6a62..3cbd6dd064 100644 --- a/inventory/service/groups.yaml +++ b/inventory/service/groups.yaml @@ -130,9 +130,7 @@ groups: - openstackid.org - openstackid[0-9]*.openstack.org paste: - - paste[0-9]*.openstack.org - paste_opendev: - - paste[0-1]*.opendev.org + - paste[0-9]*.opendev.org puppet: - cacti[0-9]*.open*.org - elasticsearch[0-9]*.open*.org @@ -143,7 +141,6 @@ groups: - openstackid-dev*.openstack.org - openstackid.org - openstackid[0-9]*.openstack.org - - paste[0-9]*.openstack.org - status*.open*.org - storyboard-dev[0-9]*.opendev.org - storyboard[0-9]*.opendev.org @@ -161,7 +158,6 @@ groups: - logstash[0-9]*.open*.org - openstackid[0-9]*.openstack.org - openstackid-dev[0-9]*.openstack.org - - paste[0-9]*.openstack.org - status*.open*.org - storyboard[0-9]*.opendev.org - storyboard-dev[0-9]*.opendev.org @@ -209,7 +205,7 @@ groups: - openstackid-dev*.openstack.org - openstackid.org - openstackid[0-9]*.openstack.org - - paste[0-9]*.open*.org + - paste[0-9]*.opendev.org - refstack[0-9]*.openstack.org - static[0-9]*.opendev.org - status*.open*.org diff --git a/manifests/site.pp b/manifests/site.pp index aee7783fb3..f4fd37aa50 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -17,18 +17,6 @@ node /^cacti\d+\.open.*\.org$/ { } } -# Node-OS: xenial -node /^paste\d*\.open.*\.org$/ { - $group = "paste" - - class { 'openstack_project::server': } - class { 'openstack_project::paste': - db_password => hiera('paste_db_password'), - db_host => hiera('paste_db_host'), - vhost_name => 'paste.openstack.org', - } -} - # Node-OS: xenial node /^ethercalc\d+\.open.*\.org$/ { $group = "ethercalc" diff --git a/modules/openstack_project/manifests/paste.pp b/modules/openstack_project/manifests/paste.pp deleted file mode 100644 index 462d329540..0000000000 --- a/modules/openstack_project/manifests/paste.pp +++ /dev/null @@ -1,19 +0,0 @@ -# == Class: openstack_project::paste -# -class openstack_project::paste ( - $db_password, - $db_host, - $vhost_name = $::fqdn, -) { - class { 'lodgeit': - lodgeit_version => 'ab592381b0cc983adf9b58456abcf836b31f7633', - } - lodgeit::site { 'openstack': - port => '5000', - db_password => $db_password, - db_host => $db_host, - db_user => 'openstack', - vhost_name => $vhost_name, - image => 'header-bg2.png', - } -} diff --git a/playbooks/service-paste.yaml b/playbooks/service-paste.yaml index e308d5e205..3e40c3fcc8 100644 --- a/playbooks/service-paste.yaml +++ b/playbooks/service-paste.yaml @@ -1,4 +1,4 @@ -- hosts: "paste_opendev:!disabled" +- hosts: "paste:!disabled" name: "Base: configure paste" roles: - iptables diff --git a/playbooks/test-paste.yaml b/playbooks/test-paste.yaml index 5d4e7105d9..94bc4c4f33 100644 --- a/playbooks/test-paste.yaml +++ b/playbooks/test-paste.yaml @@ -1,4 +1,4 @@ -- hosts: "paste_opendev" +- hosts: "paste" tasks: - name: Run selenium container