From 30a916ff949a7a1fe0caf2a4ee620816572d4464 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Fri, 21 May 2021 16:14:31 -0700 Subject: [PATCH] Cleanup puppet things from zuul where we don't puppet anymore This reduces the scope of our puppet related testing to things that continue to use puppet. This is probably not strictly necessary but helps keep us up to date with our TODO list. Change-Id: I52bfff09ad0ddeabe7ad151bcf88c912f86a76ec --- manifests/site.pp | 32 ---------------- modules.env | 24 ------------ zuul.d/puppet.yaml | 69 ----------------------------------- zuul.d/system-config-run.yaml | 7 ---- 4 files changed, 132 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 24f1ed8b6d..30195e1a1e 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -217,38 +217,6 @@ node /^status\d*\.open.*\.org$/ { } } -# Node-OS: xenial -node /^nb\d+\.open.*\.org$/ { - $group = 'nodepool' - - class { 'openstack_project::server': } - - include openstack_project - - class { '::openstackci::nodepool_builder': - nodepool_ssh_public_key => hiera('zuul_worker_ssh_public_key_contents'), - vhost_name => $::fqdn, - enable_build_log_via_http => true, - project_config_repo => 'https://opendev.org/openstack/project-config', - statsd_host => 'graphite.opendev.org', - upload_workers => '16', - revision => 'master', - python_version => 3, - zuulv3 => true, - ssl_cert_file => '/etc/ssl/certs/ssl-cert-snakeoil.pem', - ssl_key_file => '/etc/ssl/private/ssl-cert-snakeoil.key', - } - - cron { 'mirror_gitgc': - user => 'nodepool', - hour => '20', - minute => '0', - command => 'find /opt/dib_cache/source-repositories/ -type d -name "*.git" -exec git --git-dir="{}" gc \; >/dev/null', - environment => 'PATH=/usr/bin:/bin:/usr/sbin:/sbin', - require => Class['::openstackci::nodepool_builder'], - } -} - # Node-OS: xenial node /^openstackid\d*(\.openstack)?\.org$/ { $group = "openstackid" diff --git a/modules.env b/modules.env index 27bbe4b574..9d843dcc61 100644 --- a/modules.env +++ b/modules.env @@ -62,57 +62,35 @@ 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-askbot"]="origin/master" -INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-asterisk"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-bup"]="origin/master" # Remove when we convert nb03 to ansible/docker -INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-diskimage_builder"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-elastic_recheck"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-elasticsearch"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-ethercalc"]="origin/master" -INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-germqtt"]="origin/master" -INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-grafyaml"]="origin/master" -INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-graphite"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-haveged"]="origin/master" -INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-hound"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-httpd"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-jeepyb"]="origin/master" -# Remove when we convert nb03 to ansible/docker -INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-jenkins"]="origin/master" -INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-kerberos"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-kibana"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-lodgeit"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-log_processor"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-logrotate"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-logstash"]="origin/master" -INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-lpmqtt"]="origin/master" -INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-mailman"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-mediawiki"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-meetbot"]="origin/master" -INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-mosquitto"]="origin/master" -INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-mqtt_statsd"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-mysql_backup"]="origin/master" -# Remove when we convert nb03 to ansible/docker -INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-nodepool"]="origin/master" -INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-openafs"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-openstack_health"]="origin/master" -# Remove when we convert nb03 to ansible/docker -INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-openstackci"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-openstackid"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-pgsql_backup"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-pip"]="origin/master" -INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-planet"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-project_config"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-ptgbot"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-redis"]="origin/master" -INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-refstack"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-reviewday"]="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-ssl_cert_check"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-statusbot"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-storyboard"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-subunit2sql"]="origin/master" -INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-sudoers"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-tmpreaper"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-ulimit"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-user"]="origin/master" @@ -128,8 +106,6 @@ INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-user"]="origin/master" # licensed INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-vcsrepo"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-zanata"]="origin/master" -# Remove when we convert nb03 to ansible/docker -INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-zuul"]="origin/master" if [[ "$PUPPET_INTEGRATION_TEST" -ne "1" ]]; then # If puppet integration tests are not being run, merge SOURCE and INTEGRATION modules diff --git a/zuul.d/puppet.yaml b/zuul.d/puppet.yaml index 5f034e4649..bdc0d3883f 100644 --- a/zuul.d/puppet.yaml +++ b/zuul.d/puppet.yaml @@ -11,68 +11,45 @@ - opendev/ansible-role-puppet - opendev/puppet-apparmor - opendev/puppet-askbot - - opendev/puppet-asterisk - - opendev/puppet-bandersnatch - opendev/puppet-bugdaystats - opendev/puppet-bup - opendev/puppet-ciwatch - - opendev/puppet-diskimage_builder - opendev/puppet-elastic_recheck - opendev/puppet-elasticsearch - opendev/puppet-ethercalc - - opendev/puppet-germqtt - - opendev/puppet-grafyaml - - opendev/puppet-graphite - opendev/puppet-haveged - - opendev/puppet-hound - opendev/puppet-httpd - opendev/puppet-infra-cookiecutter - opendev/puppet-jeepyb - - opendev/puppet-jenkins - - opendev/puppet-kerberos - opendev/puppet-kibana - opendev/puppet-lodgeit - opendev/puppet-log_processor - opendev/puppet-logrotate - opendev/puppet-logstash - - opendev/puppet-lpmqtt - - opendev/puppet-mailman - opendev/puppet-mediawiki - opendev/puppet-meetbot - - opendev/puppet-mosquitto - - opendev/puppet-mqtt_statsd - opendev/puppet-mysql_backup - - opendev/puppet-nodepool - - opendev/puppet-openafs - - opendev/puppet-openstackci - opendev/puppet-openstack_health - opendev/puppet-openstackid - opendev/puppet-openstack_infra_spec_helper - opendev/puppet-pgsql_backup - opendev/puppet-pip - - opendev/puppet-planet - opendev/puppet-project_config - opendev/puppet-ptgbot - opendev/puppet-puppet - opendev/puppet-redis - - opendev/puppet-refstack - opendev/puppet-reviewday - opendev/puppet-simpleproxy - opendev/puppet-ssh - - opendev/puppet-ssl_cert_check - opendev/puppet-statusbot - opendev/puppet-storyboard - opendev/puppet-subunit2sql - - opendev/puppet-sudoers - opendev/puppet-tmpreaper - opendev/puppet-translation_checksite - opendev/puppet-ulimit - - opendev/puppet-unattended_upgrades - - opendev/puppet-unbound - opendev/puppet-user - opendev/puppet-vcsrepo - opendev/puppet-zanata - - opendev/puppet-zuul pre-run: playbooks/zuul/infra-puppet-apply/pre.yaml run: playbooks/zuul/infra-puppet-apply/run.yaml post-run: playbooks/zuul/infra-puppet-apply/post.yaml @@ -106,61 +83,38 @@ - opendev/puppet-openstack_infra_spec_helper - opendev/puppet-bugdaystats - opendev/puppet-mysql_backup - - opendev/puppet-openstackci - - opendev/puppet-zuul - - opendev/puppet-mqtt_statsd - opendev/puppet-meetbot - - opendev/puppet-hound - opendev/puppet-pip - opendev/puppet-openstackid - - opendev/puppet-bandersnatch - opendev/puppet-project_config - - opendev/puppet-grafyaml - - opendev/puppet-refstack - opendev/puppet-ethercalc - - opendev/puppet-unattended_upgrades - - opendev/puppet-openafs - opendev/puppet-httpd - opendev/puppet-subunit2sql - opendev/puppet-reviewday - opendev/puppet-kibana - opendev/puppet-redis - - opendev/puppet-ssl_cert_check - - opendev/puppet-lpmqtt - - opendev/puppet-germqtt - opendev/puppet-haveged - - opendev/puppet-graphite - - opendev/puppet-diskimage_builder - - opendev/puppet-sudoers - opendev/puppet-zanata - opendev/puppet-logstash - - opendev/puppet-asterisk - opendev/puppet-statusbot - opendev/puppet-mediawiki - - opendev/puppet-mailman - opendev/puppet-tmpreaper - opendev/puppet-elastic_recheck - opendev/puppet-ulimit - - opendev/puppet-planet - - opendev/puppet-nodepool - opendev/puppet-logrotate - opendev/puppet-elasticsearch - - opendev/puppet-unbound - opendev/puppet-storyboard - opendev/puppet-openstack_health - - opendev/puppet-kerberos - opendev/puppet-askbot - opendev/puppet-log_processor - opendev/puppet-simpleproxy - opendev/puppet-lodgeit - - opendev/puppet-mosquitto - opendev/puppet-bup - opendev/puppet-pgsql_backup - opendev/puppet-ssh - opendev/puppet-user - opendev/puppet-jeepyb - opendev/puppet-ptgbot - - opendev/puppet-jenkins - opendev/puppet-vcsrepo - job: @@ -201,63 +155,40 @@ - opendev/ansible-role-puppet - openstack/logstash-filters - opendev/puppet-askbot - - opendev/puppet-asterisk - - opendev/puppet-bandersnatch - opendev/puppet-bugdaystats - opendev/puppet-bup - - opendev/puppet-diskimage_builder - opendev/puppet-elastic_recheck - opendev/puppet-elasticsearch - opendev/puppet-ethercalc - - opendev/puppet-germqtt - - opendev/puppet-grafyaml - - opendev/puppet-graphite - opendev/puppet-haveged - - opendev/puppet-hound - opendev/puppet-httpd - opendev/puppet-jeepyb - - opendev/puppet-jenkins - - opendev/puppet-kerberos - opendev/puppet-kibana - opendev/puppet-lodgeit - opendev/puppet-log_processor - opendev/puppet-logrotate - opendev/puppet-logstash - - opendev/puppet-lpmqtt - - opendev/puppet-mailman - opendev/puppet-mediawiki - opendev/puppet-meetbot - - opendev/puppet-mosquitto - - opendev/puppet-mqtt_statsd - opendev/puppet-mysql_backup - - opendev/puppet-nodepool - - opendev/puppet-openafs - - opendev/puppet-openstackci - opendev/puppet-openstack_health - opendev/puppet-openstackid - opendev/puppet-pgsql_backup - opendev/puppet-pip - - opendev/puppet-planet - opendev/puppet-project_config - opendev/puppet-ptgbot - opendev/puppet-redis - - opendev/puppet-refstack - opendev/puppet-reviewday - opendev/puppet-simpleproxy - opendev/puppet-ssh - - opendev/puppet-ssl_cert_check - opendev/puppet-statusbot - opendev/puppet-storyboard - opendev/puppet-subunit2sql - - opendev/puppet-sudoers - opendev/puppet-tmpreaper - opendev/puppet-ulimit - - opendev/puppet-unattended_upgrades - - opendev/puppet-unbound - opendev/puppet-user - opendev/puppet-vcsrepo - opendev/puppet-zanata - - opendev/puppet-zuul - opendev/system-config run: playbooks/zuul/logstash-filters/run.yaml post-run: playbooks/zuul/logstash-filters/post.yaml diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml index a4ad7519bd..4fee568773 100644 --- a/zuul.d/system-config-run.yaml +++ b/zuul.d/system-config-run.yaml @@ -241,7 +241,6 @@ - name: nb01.opendev.org label: ubuntu-bionic required-projects: - - opendev/ansible-role-puppet - opendev/system-config - openstack/project-config host-vars: @@ -258,7 +257,6 @@ - playbooks/letsencrypt.yaml - playbooks/service-zookeeper.yaml - playbooks/service-nodepool.yaml - - playbooks/remote_puppet_else.yaml # Test our ad hoc restart playbook works - playbooks/nodepool_restart.yaml files: @@ -266,9 +264,6 @@ - inventory/service/group_vars/nodepool.yaml - inventory/service/group_vars/nodepool-builder.yaml - inventory/service/group_vars/nodepool-launcher.yaml - - inventory/service/group_vars/puppet - - playbooks/roles/run-puppet/ - - playbooks/roles/install-ansible-roles/ - playbooks/roles/configure-openstacksdk/ - playbooks/roles/nodepool - playbooks/templates/clouds/ @@ -632,8 +627,6 @@ nodes: - name: bridge.openstack.org label: ubuntu-bionic - # NOTE(ianw): 01 is a half-puppet opendev.org - # server - name: graphite02.opendev.org label: ubuntu-focal vars: