Browse Source

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
changes/55/843955/1
Clark Boylan 3 months ago
parent
commit
5cc6c14a6d
  1. 1
      hiera/common.yaml
  2. 7
      inventory/base/hosts.yaml
  3. 6
      inventory/service/groups.yaml
  4. 3
      inventory/service/host_vars/ethercalc02.openstack.org.yaml
  5. 13
      manifests/site.pp
  6. 3
      modules.env
  7. 24
      modules/openstack_project/manifests/ethercalc.pp
  8. 3
      playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
  9. 2
      zuul.d/puppet.yaml

1
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

7
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:

6
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

3
inventory/service/host_vars/ethercalc02.openstack.org.yaml

@ -1,3 +0,0 @@
letsencrypt_certs:
ethercalc02-openstack-org-main:
- ethercalc.openstack.org

13
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$/ {

3
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"

24
modules/openstack_project/manifests/ethercalc.pp

@ -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
}

3
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

2
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

Loading…
Cancel
Save