From 159ada0e7c783d420c9770e25ece229d9c682740 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Wed, 5 May 2021 10:19:52 +1000 Subject: [PATCH] Cleanup ssl_cert_check puppet components This migrated to Ansible with Idbe084f13f3684021e8efd9ac69b63fe31484606. Remove the now unused puppet components. Change-Id: I500d6eefcb64f4941e216b8590f4cd60ceec0811 --- manifests/site.pp | 3 - .../files/ssl_cert_check/ssldomains | 61 ------------------- .../manifests/ssl_cert_check.pp | 16 ----- 3 files changed, 80 deletions(-) delete mode 100644 modules/openstack_project/files/ssl_cert_check/ssldomains delete mode 100644 modules/openstack_project/manifests/ssl_cert_check.pp diff --git a/manifests/site.pp b/manifests/site.pp index a040784308..bfd8a8769a 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -11,9 +11,6 @@ node /^health\d*\.openstack\.org$/ { # Node-OS: xenial node /^cacti\d+\.open.*\.org$/ { $group = "cacti" - # NOTE(ianw) 2020-05 : disabled pending removal, migrated to - # ansible. - # include openstack_project::ssl_cert_check class { 'openstack_project::cacti': cacti_hosts => hiera_array('cacti_hosts'), vhost_name => 'cacti.openstack.org', diff --git a/modules/openstack_project/files/ssl_cert_check/ssldomains b/modules/openstack_project/files/ssl_cert_check/ssldomains deleted file mode 100644 index 0007f500fb..0000000000 --- a/modules/openstack_project/files/ssl_cert_check/ssldomains +++ /dev/null @@ -1,61 +0,0 @@ -ask.openstack.org 443 -ci.openstack.org 443 -cinder.openstack.org 443 -developer.openstack.org 443 -devstack.org 443 -docs.opendev.org 443 -docs.openstack.org 443 -docs.starlingx.io 443 -ethercalc.openstack.org 443 -etherpad.openstack.org 443 -files.openstack.org 443 -git.airshipit.org 443 -git.openstack.org 443 -git.starlingx.io 443 -git.zuul-ci.org 443 -gitea01.opendev.org 3000 -gitea02.opendev.org 3000 -gitea03.opendev.org 3000 -gitea04.opendev.org 3000 -gitea05.opendev.org 3000 -gitea06.opendev.org 3000 -gitea07.opendev.org 3000 -gitea08.opendev.org 3000 -glance.openstack.org 443 -governance.openstack.org 443 -graphite.opendev.org 443 -horizon.openstack.org 443 -insecure-ci-registry.opendev.org 5000 -keystone.openstack.org 443 -meetpad.opendev.org 443 -mirror.dfw.rax.opendev.org 443 -mirror.bhs1.ovh.opendev.org 443 -mirror.gra1.ovh.opendev.org 443 -mirror.mtl01.inap.opendev.org 443 -mirror.ord.rax.opendev.org 443 -mirror.regionone.linaro-us.opendev.org 443 -mirror.sjc1.vexxhost.opendev.org 443 -mirror.ca-ymq-1.vexxhost.opendev.org 443 -mirror.regionone.limestone.opendev.org 443 -nova.openstack.org 443 -opendev.org 443 -openstackid-dev.openstack.org 443 -openstackid.org 443 -refstack.openstack.org 443 -review.opendev.org 443 -review.openstack.org 443 -security.openstack.org 443 -static.openstack.org 443 -storyboard.openstack.org 443 -summit.openstack.org 443 -static.opendev.org 443 -static.openstack.org 443 -swift.openstack.org 443 -tarballs.opendev.org 443 -tarballs.openstack.org 443 -translate.openstack.org 443 -wiki.openstack.org 443 -www.openstack.org 443 -zuul-ci.org 443 -zuul.opendev.org 443 -zuul.openstack.org 443 diff --git a/modules/openstack_project/manifests/ssl_cert_check.pp b/modules/openstack_project/manifests/ssl_cert_check.pp deleted file mode 100644 index ee394b8a10..0000000000 --- a/modules/openstack_project/manifests/ssl_cert_check.pp +++ /dev/null @@ -1,16 +0,0 @@ -# Class to configure ssl-cert-check on a node. -class openstack_project::ssl_cert_check { - class { '::ssl_cert_check': - domainlist_file => '/var/lib/certcheck/ssldomains', - email => 'root', - days => '30' - } - - file { '/var/lib/certcheck/ssldomains': - ensure => present, - owner => 'certcheck', - group => 'certcheck', - mode => '0444', - source => 'puppet:///modules/openstack_project/ssl_cert_check/ssldomains' - } -}