From 6a0cebeda23e8cc4b3798eff60d5678eeae73958 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Wed, 6 Dec 2017 16:03:49 -0500 Subject: [PATCH] Remove zuulv2 long lived servers We no longer need our proposal or signing nodes. These are now managed directly in zuulv3 jobs (via nodepool). Also noticed wheel mirror group was never deleted, so removing that too. Change-Id: Ibca89052b8d27093e17a33cb738fd3855538dca1 Signed-off-by: Paul Belanger --- hiera/common.yaml | 3 - hiera/group/zuul-merger.yaml | 13 +- manifests/site.pp | 52 -------- .../files/puppetmaster/groups.txt | 2 - .../manifests/proposal_slave.pp | 53 -------- .../manifests/release_slave.pp | 125 ------------------ .../manifests/signing_node.pp | 107 --------------- 7 files changed, 1 insertion(+), 354 deletions(-) delete mode 100644 modules/openstack_project/manifests/proposal_slave.pp delete mode 100644 modules/openstack_project/manifests/release_slave.pp delete mode 100644 modules/openstack_project/manifests/signing_node.pp diff --git a/hiera/common.yaml b/hiera/common.yaml index 822a5342fa..d1e7fc41fc 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -449,7 +449,6 @@ cacti_hosts: - paste.openstack.org - pbx.openstack.org - planet01.openstack.org -- proposal.slave.openstack.org - puppetmaster.openstack.org - mirror01.dfw.rax.openstack.org - mirror01.ord.rax.openstack.org @@ -467,10 +466,8 @@ cacti_hosts: - mirror.regionone.tripleo-test-cloud-rh1.openstack.org - mirror.regionone.tripleo-test-cloud-rh2.openstack.org - mirror-update.openstack.org -- release.slave.openstack.org - review-dev.openstack.org - review.openstack.org -- signing01.ci.openstack.org - stackalytics.openstack.org - static.openstack.org - status.openstack.org diff --git a/hiera/group/zuul-merger.yaml b/hiera/group/zuul-merger.yaml index 9e70c515a5..359c682661 100644 --- a/hiera/group/zuul-merger.yaml +++ b/hiera/group/zuul-merger.yaml @@ -26,18 +26,7 @@ zuul_sites: keytab: '/etc/zuul-launcher.keytab' user: 'service/zuul-launcher' -zuul_nodes: - - name: 'proposal.slave.openstack.org' - host: 'proposal.slave.openstack.org' - labels: 'proposal' - - - name: 'release.slave.openstack.org' - host: 'release.slave.openstack.org' - labels: 'release' - - - name: 'signing01.ci.openstack.org' - host: 'signing01.ci.openstack.org' - labels: 'signing' +zuul_nodes: [] # NOTE(pabelanger): zuulv3 settings zuul_connections: diff --git a/manifests/site.pp b/manifests/site.pp index 48630e3917..a43d287598 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1552,58 +1552,6 @@ node /^backup\d+\..*\.ci\.openstack\.org$/ { include openstack_project::backup_server } -# Node-OS: trusty -node 'proposal.slave.openstack.org' { - include openstack_project - class { 'openstack_project::proposal_slave': - jenkins_ssh_public_key => $openstack_project::jenkins_ssh_key, - proposal_ssh_public_key => hiera('proposal_ssh_public_key_contents'), - proposal_ssh_private_key => hiera('proposal_ssh_private_key_contents'), - zanata_server_url => 'https://translate.openstack.org/', - zanata_server_user => hiera('proposal_zanata_user'), - zanata_server_api_key => hiera('proposal_zanata_api_key'), - } -} - -# Node-OS: trusty -node 'release.slave.openstack.org' { - $group = "afsadmin" - - include openstack_project - class { 'openstack_project::release_slave': - pypi_username => 'openstackci', - pypi_password => hiera('pypi_password'), - jenkins_ssh_public_key => $openstack_project::jenkins_ssh_key, - jenkinsci_username => hiera('jenkins_ci_org_user', 'username'), - jenkinsci_password => hiera('jenkins_ci_org_password'), - mavencentral_username => hiera('mavencentral_org_user', 'username'), - mavencentral_password => hiera('mavencentral_org_password'), - puppet_forge_username => hiera('puppet_forge_username', 'username'), - puppet_forge_password => hiera('puppet_forge_password'), - npm_username => 'openstackci', - npm_userpassword => hiera('npm_user_password'), - npm_userurl => 'https://openstack.org', - admin_keytab => hiera('afsadmin_keytab'), - packaging_keytab => hiera('packaging_keytab'), - } -} - -# Node-OS: trusty -node /^signing\d+\.ci\.openstack\.org$/ { - $group = "signing" - include openstack_project - class { 'openstack_project::signing_node': - jenkins_ssh_public_key => $openstack_project::jenkins_ssh_key, - packaging_keytab => hiera('packaging_keytab'), - pubring => hiera('pubring'), - secring => hiera('secring'), - gerritkey => hiera('gerritkey'), - lp_access_token => hiera('lp_access_token'), - lp_access_secret => hiera('lp_access_secret'), - lp_consumer_key => hiera('lp_consumer_key'), - } -} - # Node-OS: trusty node 'openstackid.org' { class { 'openstack_project::openstackid_prod': diff --git a/modules/openstack_project/files/puppetmaster/groups.txt b/modules/openstack_project/files/puppetmaster/groups.txt index 7fb235f0b6..638f2c606c 100644 --- a/modules/openstack_project/files/puppetmaster/groups.txt +++ b/modules/openstack_project/files/puppetmaster/groups.txt @@ -11,11 +11,9 @@ git-loadbalancer ~git(-fe\d+)?\.openstack\.org git-server ~git\d+\.openstack\.org logstash-worker ~logstash-worker\d+\.openstack\.org nodepool nodepool*.openstack.org:nb*.openstack.org:nl*.openstack.org -signing signing*.ci.openstack.org subunit-worker ~subunit-worker\d+\.openstack\.org translate ~translate\d+\.openstack\.org translate-dev ~translate-dev\d*\.openstack\.org -wheel-mirror *wheel-mirror-*.openstack.org wiki ~wiki\d+\.openstack\.org wiki-dev ~wiki-dev\d+\.openstack\.org zuul-merger ~z[lm](static)?\d+\.openstack\.org diff --git a/modules/openstack_project/manifests/proposal_slave.pp b/modules/openstack_project/manifests/proposal_slave.pp deleted file mode 100644 index ed668dd993..0000000000 --- a/modules/openstack_project/manifests/proposal_slave.pp +++ /dev/null @@ -1,53 +0,0 @@ -# Slave used for automatically proposing changes to Gerrit, -# Transifex and other tools. -# -# == Class: openstack_project::translation_slave -# -class openstack_project::proposal_slave ( - $jenkins_ssh_public_key, - $proposal_ssh_public_key, - $proposal_ssh_private_key, - $jenkins_gitfullname = 'OpenStack Jenkins', - $jenkins_gitemail = 'jenkins@openstack.org', - $project_config_repo = 'https://git.openstack.org/openstack-infra/project-config', - $zanata_server_url, - $zanata_server_user, - $zanata_server_api_key, -) { - - class { '::zanata::client': - server_url => $zanata_server_url, - server_user => $zanata_server_user, - server_api_key => $zanata_server_api_key, - } - - class { 'openstack_project::slave': - ssh_key => $jenkins_ssh_public_key, - jenkins_gitfullname => $jenkins_gitfullname, - jenkins_gitemail => $jenkins_gitemail, - project_config_repo => $project_config_repo, - } - - package { ['Babel', 'pyopenssl', 'ndg-httpsclient', 'pyasn1', - 'pyyaml', 'requestsexceptions']: - ensure => latest, - provider => openstack_pip, - require => Class['pip'], - } - - file { '/home/jenkins/.ssh/id_rsa': - owner => 'jenkins', - group => 'jenkins', - mode => '0400', - require => File['/home/jenkins/.ssh'], - content => $proposal_ssh_private_key, - } - - file { '/home/jenkins/.ssh/id_rsa.pub': - owner => 'jenkins', - group => 'jenkins', - mode => '0400', - require => File['/home/jenkins/.ssh'], - content => $proposal_ssh_public_key, - } -} diff --git a/modules/openstack_project/manifests/release_slave.pp b/modules/openstack_project/manifests/release_slave.pp deleted file mode 100644 index 8ba6ff767d..0000000000 --- a/modules/openstack_project/manifests/release_slave.pp +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 2012 Hewlett-Packard Development Company, L.P. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# Class to install dependencies for uploading releases to pypi, maven and -# similar external repositories -# -class openstack_project::release_slave ( - $pypi_password, - $jenkins_ssh_public_key, - $pypi_username = 'openstackci', - $jenkinsci_username, - $jenkinsci_password, - $mavencentral_username, - $mavencentral_password, - $puppet_forge_username, - $puppet_forge_password, - $jenkins_gitfullname = 'OpenStack Jenkins', - $jenkins_gitemail = 'jenkins@openstack.org', - $project_config_repo = 'https://git.openstack.org/openstack-infra/project-config', - $npm_username, - $npm_userpassword, - $npm_userurl, - $admin_keytab = '', - $packaging_keytab = '', -) { - class { 'openstack_project::slave': - ssh_key => $jenkins_ssh_public_key, - jenkins_gitfullname => $jenkins_gitfullname, - jenkins_gitemail => $jenkins_gitemail, - project_config_repo => $project_config_repo, - afs => true, - } - - file { '/etc/afsadmin.keytab': - owner => 'jenkins', - group => 'jenkins', - mode => '0400', - content => $admin_keytab, - } - - package { 'twine': - ensure => present, - } - - package { 'python-wheel': - ensure => present - } - - class { '::nodejs': - repo_url_suffix => 'node_0.12', - } - - file { '/home/jenkins/.npmrc': - ensure => present, - owner => 'jenkins', - group => 'jenkins', - mode => '0600', - content => template('openstack_project/npmrc.erb'), - require => File['/home/jenkins'], - } - - file { '/home/jenkins/.pypirc': - ensure => present, - owner => 'jenkins', - group => 'jenkins', - mode => '0600', - content => template('openstack_project/pypirc.erb'), - require => File['/home/jenkins'], - } - - file { '/home/jenkins/.jenkinsci-curl': - ensure => present, - owner => 'jenkins', - group => 'jenkins', - mode => '0600', - content => template('openstack_project/jenkinsci-curl.erb'), - require => File['/home/jenkins'], - } - - file { '/home/jenkins/.mavencentral-curl': - ensure => present, - owner => 'jenkins', - group => 'jenkins', - mode => '0600', - content => template('openstack_project/mavencentral-curl.erb'), - require => File['/home/jenkins'], - } - - file { '/home/jenkins/.puppetforge.yml': - ensure => present, - owner => 'jenkins', - group => 'jenkins', - mode => '0600', - content => template('openstack_project/puppetforge.yml.erb'), - require => File['/home/jenkins'], - } - - include ::openstack_project::reprepro_mirror - - file { '/etc/packaging.keytab': - owner => 'jenkins', - group => 'jenkins', - mode => '0400', - content => $packaging_keytab, - } - - ### Debian Openstack Packages ### - ::openstack_project::reprepro { 'debian-openstack-reprepro': - confdir => '/etc/reprepro/debian-openstack', - basedir => '/afs/.openstack.org/mirror/debian-openstack', - distributions => 'openstack_project/reprepro/distributions.debian-openstack.erb', - releases => ['jessie-newton', 'jessie-ocata'], - } -} diff --git a/modules/openstack_project/manifests/signing_node.pp b/modules/openstack_project/manifests/signing_node.pp deleted file mode 100644 index 3a76b6101e..0000000000 --- a/modules/openstack_project/manifests/signing_node.pp +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 2016 OpenStack Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# Class to install dependencies for uploading releases to pypi, maven and -# similar external repositories -# -class openstack_project::signing_node ( - $jenkins_ssh_public_key, - $pubring, - $secring, - $lp_access_token, - $lp_access_secret, - $lp_consumer_key, - $gitfullname = 'OpenStack Release Bot', - $gitemail = 'infra-root@openstack.org', - $gitpgpkey = 'infra-root@openstack.org', - $gerrituser = 'release', - $gerritkey = undef, - $project_config_repo = 'https://git.openstack.org/openstack-infra/project-config', - $packaging_keytab = '', -) { - class { 'openstack_project::slave': - thin => true, - ssh_key => $jenkins_ssh_public_key, - jenkins_gitfullname => $gitfullname, - jenkins_gitemail => $gitemail, - jenkins_gitpgpkey => $gitpgpkey, - jenkins_gerrituser => $gerrituser, - jenkins_gerritkey => $gerritkey, - project_config_repo => $project_config_repo, - afs => true, - } - - file { '/etc/packaging.keytab': - owner => 'jenkins', - group => 'jenkins', - mode => '0400', - content => $packaging_keytab, - } - - package { 'gnupg': - ensure => present, - } - - file { '/home/jenkins/.gnupg': - ensure => directory, - owner => 'jenkins', - group => 'jenkins', - mode => '0700', - require => File['/home/jenkins'], - } - - file { '/home/jenkins/.gnupg/pubring.gpg': - ensure => present, - owner => 'jenkins', - group => 'jenkins', - mode => '0400', - content => $pubring, - require => File['/home/jenkins/.gnupg'], - } - - file { '/home/jenkins/.gnupg/secring.gpg': - ensure => present, - owner => 'jenkins', - group => 'jenkins', - mode => '0400', - content => $secring, - require => File['/home/jenkins/.gnupg'], - } - - package { 'python-launchpadlib': - ensure => present, - } - - file { '/home/jenkins/.launchpadlib': - ensure => directory, - owner => 'jenkins', - group => 'jenkins', - mode => '0700', - require => File['/home/jenkins'], - } - - file { '/home/jenkins/.launchpadlib/creds': - ensure => present, - owner => 'jenkins', - group => 'jenkins', - mode => '0600', - content => template('openstack_project/infra_lp_creds.erb'), - require => File['/home/jenkins/.launchpadlib'], - } - - package { 'python3-yaml': - ensure => present, - } - -}