From 5476e882e3930feab4c8cbc5a3a88ffa0d573ec1 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Wed, 19 Dec 2018 20:30:28 +0000 Subject: [PATCH] Remove deleted review and puppetmaster servers Remove the Ansible inventory and Puppet global site manifest entries for the old review.openstack.org and puppetmaster.openstack.org servers. These have been deleted. Change-Id: I4bfc6cfe357ad6a499c10455c26ee2fb97713b7d --- inventory/openstack.yaml | 16 -------------- manifests/site.pp | 47 ---------------------------------------- 2 files changed, 63 deletions(-) diff --git a/inventory/openstack.yaml b/inventory/openstack.yaml index 1138699704..5e3ae9d0a2 100644 --- a/inventory/openstack.yaml +++ b/inventory/openstack.yaml @@ -832,14 +832,6 @@ all: private_v4: '' public_v4: 199.204.45.22 public_v6: 2604:e100:1:0:f816:3eff:fe05:7ce0 - puppetmaster.openstack.org: - ansible_host: 2001:4800:7818:101:3c21:a454:23ed:4072 - location: - cloud: openstackci-rax - region_name: DFW - private_v4: 10.208.226.85 - public_v4: 23.253.245.198 - public_v6: 2001:4800:7818:101:3c21:a454:23ed:4072 refstack.openstack.org: ansible_host: 2001:4800:7817:103:be76:4eff:fe05:5870 location: @@ -856,14 +848,6 @@ all: private_v4: 10.209.129.244 public_v4: 23.253.109.117 public_v6: 2001:4800:7819:104:be76:4eff:fe04:4153 - review.openstack.org: - ansible_host: 2001:4800:7819:103:be76:4eff:fe05:8525 - location: - cloud: openstackci-rax - region_name: DFW - private_v4: 10.223.160.141 - public_v4: 104.130.246.91 - public_v6: 2001:4800:7819:103:be76:4eff:fe05:8525 review01.openstack.org: ansible_host: 2001:4800:7819:103:be76:4eff:fe04:9229 location: diff --git a/manifests/site.pp b/manifests/site.pp index 9543c6c9fd..1c072f3f3c 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -18,44 +18,6 @@ node default { # # Long lived servers: # -# Node-OS: xenial -node 'review.openstack.org' { - class { 'openstack_project::server': } - - class { 'openstack_project::review': - project_config_repo => 'https://git.openstack.org/openstack-infra/project-config', - github_oauth_token => hiera('gerrit_github_token'), - github_project_username => hiera('github_project_username', 'username'), - github_project_password => hiera('github_project_password'), - mysql_host => hiera('gerrit_mysql_host', 'localhost'), - mysql_password => hiera('gerrit_mysql_password'), - email_private_key => hiera('gerrit_email_private_key'), - token_private_key => hiera('gerrit_rest_token_private_key'), - gerritbot_password => hiera('gerrit_gerritbot_password'), - gerritbot_ssh_rsa_key_contents => hiera('gerritbot_ssh_rsa_key_contents'), - gerritbot_ssh_rsa_pubkey_contents => hiera('gerritbot_ssh_rsa_pubkey_contents'), - ssl_cert_file_contents => hiera('gerrit_ssl_cert_file_contents'), - ssl_key_file_contents => hiera('gerrit_ssl_key_file_contents'), - ssl_chain_file_contents => hiera('gerrit_ssl_chain_file_contents'), - ssh_dsa_key_contents => hiera('gerrit_ssh_dsa_key_contents'), - ssh_dsa_pubkey_contents => hiera('gerrit_ssh_dsa_pubkey_contents'), - ssh_rsa_key_contents => hiera('gerrit_ssh_rsa_key_contents'), - ssh_rsa_pubkey_contents => hiera('gerrit_ssh_rsa_pubkey_contents'), - ssh_project_rsa_key_contents => hiera('gerrit_project_ssh_rsa_key_contents'), - ssh_project_rsa_pubkey_contents => hiera('gerrit_project_ssh_rsa_pubkey_contents'), - ssh_welcome_rsa_key_contents => hiera('welcome_message_gerrit_ssh_private_key'), - ssh_welcome_rsa_pubkey_contents => hiera('welcome_message_gerrit_ssh_public_key'), - ssh_replication_rsa_key_contents => hiera('gerrit_replication_ssh_rsa_key_contents'), - ssh_replication_rsa_pubkey_contents => hiera('gerrit_replication_ssh_rsa_pubkey_contents'), - lp_access_token => hiera('gerrit_lp_access_token'), - lp_access_secret => hiera('gerrit_lp_access_secret'), - lp_consumer_key => hiera('gerrit_lp_consumer_key'), - swift_username => hiera('swift_store_user', 'username'), - swift_password => hiera('swift_store_key'), - storyboard_password => hiera('gerrit_storyboard_token'), - } -} - # Node-OS: xenial node 'review01.openstack.org' { $group = "review" @@ -163,15 +125,6 @@ node /^cacti\d+\.openstack\.org$/ { } } -# Node-OS: trusty -node 'puppetmaster.openstack.org' { - class { 'openstack_project::server': - pin_puppet => '3.6.', - } - class { 'openstack_project::puppetmaster': - } -} - # Node-OS: trusty # Node-OS: xenial node /^graphite\d*\.openstack\.org$/ {