From 5cc6c14a6daaa503bb04b3984184af9a93760c41 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 30 May 2022 12:57:48 -0700 Subject: [PATCH] Remove ethercalc config management About a month ago we announced [0][1] that this server would be shutdown and removed on May 31, 2022. Before we can shutdown the server we need to remove it from config management to prevent Ansible errors. This change is safe to land now, then on the 31st we can shutdown, snapshot, and delete the server. [0] https://lists.opendev.org/pipermail/service-announce/2022-May/000038.html [1] https://lists.openstack.org/pipermail/openstack-discuss/2022-May/028408.html Change-Id: Ic44bed01384845e5b6322eeed02dd0932501cdb3 --- hiera/common.yaml | 1 - inventory/base/hosts.yaml | 7 ------ inventory/service/groups.yaml | 6 ----- .../host_vars/ethercalc02.openstack.org.yaml | 3 --- manifests/site.pp | 13 ---------- modules.env | 3 --- .../openstack_project/manifests/ethercalc.pp | 24 ------------------- .../handlers/main.yaml | 3 --- zuul.d/puppet.yaml | 2 -- 9 files changed, 62 deletions(-) delete mode 100644 inventory/service/host_vars/ethercalc02.openstack.org.yaml delete mode 100644 modules/openstack_project/manifests/ethercalc.pp diff --git a/hiera/common.yaml b/hiera/common.yaml index f9c462a6b7..8511fde2b0 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -14,7 +14,6 @@ cacti_hosts: - bridge.openstack.org - cacti.openstack.org - eavesdrop01.opendev.org -- ethercalc02.openstack.org - etherpad01.opendev.org - gitea-lb01.opendev.org - gitea01.opendev.org diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml index 337b15b273..0043960264 100644 --- a/inventory/base/hosts.yaml +++ b/inventory/base/hosts.yaml @@ -91,13 +91,6 @@ all: region_name: DFW public_v4: 104.239.144.232 public_v6: 2001:4800:7818:104:be76:4eff:fe04:46c8 - ethercalc02.openstack.org: - ansible_host: 162.242.144.125 - location: - cloud: openstackci-rax - region_name: DFW - public_v4: 162.242.144.125 - public_v6: 2001:4800:7817:101:be76:4eff:fe04:5674 etherpad01.opendev.org: ansible_host: 104.130.124.120 location: diff --git a/inventory/service/groups.yaml b/inventory/service/groups.yaml index 54b29c71b2..35fd4b652f 100644 --- a/inventory/service/groups.yaml +++ b/inventory/service/groups.yaml @@ -31,7 +31,6 @@ groups: - review99.opendev.org # All these servers are "special-cased" in specifically # as they are puppet and should be replaced "soon" - - ethercalc02.openstack.org - lists.openstack.org - storyboard01.opendev.org - translate01.openstack.org @@ -52,7 +51,6 @@ groups: - adns*.opendev.org - ns*.opendev.org eavesdrop: eavesdrop[0-9]*.opendev.org - ethercalc: ethercalc*.open*.org etherpad: etherpad[0-9]*.open*.org gitea: - gitea[0-9]*.opendev.org @@ -84,7 +82,6 @@ groups: - codesearch[0-9]*.opendev.org - eavesdrop[0-9]*.opendev.org - etherpad[0-9]*.opendev.org - - ethercalc[0-9]*.open*.org - gitea[0-9]*.opendev.org - grafana[0-9]*.opendev.org - graphite[0-9]*.opendev.org @@ -124,14 +121,12 @@ groups: - paste[0-9]*.opendev.org puppet: - cacti[0-9]*.open*.org - - ethercalc[0-9]*.open*.org - storyboard-dev[0-9]*.opendev.org - storyboard[0-9]*.opendev.org - translate-dev[0-9]*.open*.org - translate[0-9]*.open*.org puppet4: - cacti[0-9]*.open*.org - - ethercalc[0-9]*.open*.org - storyboard[0-9]*.opendev.org - storyboard-dev[0-9]*.opendev.org - translate[0-9]*.open*.org @@ -159,7 +154,6 @@ groups: - cacti[0-9]*.open*.org - codesearch[0-9]*.opendev.org # eavesdrop has its own group with custom ports - - ethercalc[0-9]*.open*.org - etherpad[0-9]*.open*.org - grafana[0-9]*.opendev.org - graphite*.opendev.org diff --git a/inventory/service/host_vars/ethercalc02.openstack.org.yaml b/inventory/service/host_vars/ethercalc02.openstack.org.yaml deleted file mode 100644 index 0af31c876f..0000000000 --- a/inventory/service/host_vars/ethercalc02.openstack.org.yaml +++ /dev/null @@ -1,3 +0,0 @@ -letsencrypt_certs: - ethercalc02-openstack-org-main: - - ethercalc.openstack.org diff --git a/manifests/site.pp b/manifests/site.pp index eb41080f7b..ee5ea934a0 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -7,19 +7,6 @@ node /^cacti\d+\.open.*\.org$/ { } } -# Node-OS: xenial -node /^ethercalc\d+\.open.*\.org$/ { - $group = "ethercalc" - class { 'openstack_project::server': } - - class { 'openstack_project::ethercalc': - vhost_name => 'ethercalc.openstack.org', - ssl_cert_file => '/etc/letsencrypt-certs/ethercalc.openstack.org/ethercalc.openstack.org.cer', - ssl_key_file => '/etc/letsencrypt-certs/ethercalc.openstack.org/ethercalc.openstack.org.key', - ssl_chain_file => '/etc/letsencrypt-certs/ethercalc.openstack.org/ca.cer', - } -} - # A machine to run Storyboard # Node-OS: xenial node /^storyboard\d+\.opendev\.org$/ { diff --git a/modules.env b/modules.env index 16817e75b1..1034006b49 100644 --- a/modules.env +++ b/modules.env @@ -57,7 +57,6 @@ SOURCE_MODULES["https://github.com/voxpupuli/puppet-nodejs"]="v2.3.0" # Add modules that should be part of the openstack-infra integration test here # Please keep sorted INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-bup"]="origin/master" -INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-ethercalc"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-httpd"]="origin/master" # Storyboard and translate use the jeepyb module INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-jeepyb"]="origin/master" @@ -65,8 +64,6 @@ INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-logrotate"]="origin/mast INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-mysql_backup"]="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 -INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-redis"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-simpleproxy"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-ssh"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-storyboard"]="origin/master" diff --git a/modules/openstack_project/manifests/ethercalc.pp b/modules/openstack_project/manifests/ethercalc.pp deleted file mode 100644 index a86f96d40f..0000000000 --- a/modules/openstack_project/manifests/ethercalc.pp +++ /dev/null @@ -1,24 +0,0 @@ -class openstack_project::ethercalc ( - $vhost_name = $::fqdn, - $ssl_cert_file = '/etc/ssl/certs/ethercalc.openstack.org.pem', - $ssl_key_file = '/etc/ssl/private/ethercalc.openstack.org.key', - $ssl_chain_file = '/etc/ssl/certs/intermediate.pem', - $ssl_cert_file_contents = '', - $ssl_key_file_contents = '', - $ssl_chain_file_contents = '', -) { - class { '::ethercalc': } - - class { 'ethercalc::apache': - vhost_name => $vhost_name, - ssl_cert_file => $ssl_cert_file, - ssl_key_file => $ssl_key_file, - ssl_chain_file => $ssl_chain_file, - ssl_cert_file_contents => $ssl_cert_file_contents, - ssl_key_file_contents => $ssl_key_file_contents, - ssl_chain_file_contents => $ssl_chain_file_contents, - } - - include ethercalc::redis - -} diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml index f9437b0ade..618b89fc39 100644 --- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml +++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml @@ -250,9 +250,6 @@ - name: letsencrypt updated etherpad01-opendev-org-main include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml -- name: letsencrypt updated ethercalc02-openstack-org-main - include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml - - name: letsencrypt updated keycloak01-opendev-org-main include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml diff --git a/zuul.d/puppet.yaml b/zuul.d/puppet.yaml index 265a2f2874..b9c266b3a6 100644 --- a/zuul.d/puppet.yaml +++ b/zuul.d/puppet.yaml @@ -10,7 +10,6 @@ - opendev/system-config - opendev/ansible-role-puppet - opendev/puppet-bup - - opendev/puppet-ethercalc - opendev/puppet-httpd - opendev/puppet-jeepyb - opendev/puppet-logrotate @@ -78,7 +77,6 @@ - opendev/puppet-mysql_backup - opendev/puppet-pip - opendev/puppet-project_config - - opendev/puppet-ethercalc - opendev/puppet-httpd - opendev/puppet-redis - opendev/puppet-zanata