opendev/system-config
Code Issues Proposed changes

Revert "Setup known_hosts file on gerrit servers"

Browse Source 
The key is not in heira.

This reverts commit 956372cd395d0c7050464078a3a861e7e97faf35.

Change-Id: I19bc0f418318edc839c4eca168cd3c05ac7655f0
This commit is contained in:
Monty Taylor 2017-04-07 05:39:56 -05:00
parent 9f63c458aa
commit bf456b38d1
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
4 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/site.pp
View File

@ -36,7 +36,6 @@ node 'review.openstack.org' {
mysql_password => hiera('gerrit_mysql_password'),
email_private_key => hiera('gerrit_email_private_key'),
token_private_key => hiera('gerrit_rest_token_private_key'),
gerrit_ssh_known_hosts => hiera('gerrit_ssh_known_hosts'),
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'),
@ -82,7 +81,6 @@ node 'review-dev.openstack.org' {
email_private_key => hiera('gerrit_dev_email_private_key'),
contactstore_appsec => hiera('gerrit_dev_contactstore_appsec'),
contactstore_pubkey => hiera('gerrit_dev_contactstore_pubkey'),
gerrit_ssh_known_hosts => hiera('gerrit_ssh_known_hosts'),
ssh_dsa_key_contents => hiera('gerrit_dev_ssh_dsa_key_contents'),
ssh_dsa_pubkey_contents => hiera('gerrit_dev_ssh_dsa_pubkey_contents'),
ssh_rsa_key_contents => hiera('gerrit_dev_ssh_rsa_key_contents'),

2
modules/openstack_project/manifests/gerrit.pp
View File

@ -10,7 +10,6 @@ class openstack_project::gerrit (
$canonicalweburl = "https://${::fqdn}/",
$git_http_url = '',
$canonical_git_url = '',
$gerrit_ssh_known_hosts = '',
$serveradmin = 'webmaster@openstack.org',
$ssh_host_key = '/home/gerrit2/review_site/etc/ssh_host_rsa_key',
$ssh_project_key = '/home/gerrit2/review_site/etc/ssh_project_rsa_key',
@ -124,7 +123,6 @@ class openstack_project::gerrit (
enable_javamelody_top_menu => false,
# passthrough
java_home => $java_home,
known_hosts_content => $gerrit_ssh_known_hosts,
ssl_cert_file => $ssl_cert_file,
ssl_key_file => $ssl_key_file,
ssl_chain_file => $ssl_chain_file,

2
modules/openstack_project/manifests/review.pp
View File

@ -85,7 +85,6 @@ class openstack_project::review (
$storyboard_password = '',
$project_config_repo = '',
$projects_config = 'openstack_project/review.projects.ini.erb',
$gerrit_ssh_known_hosts = '',
) {
$java_home = $::lsbdistcodename ? {
@ -117,7 +116,6 @@ class openstack_project::review (
ssh_replication_rsa_pubkey_contents => $ssh_replication_rsa_pubkey_contents,
ssh_welcome_rsa_key_contents => $ssh_welcome_rsa_key_contents,
ssh_welcome_rsa_pubkey_contents => $ssh_welcome_rsa_pubkey_contents,
gerrit_ssh_known_hosts => "${gerrit_ssh_known_hosts} ${gerrit_ssh_host_key}",
email => 'review@openstack.org',
# 1 + 100 + 9 + 2 + 2 + 25 => 139(rounded up)
database_poollimit => '225',

2
modules/openstack_project/manifests/review_dev.pp
View File

@ -29,7 +29,6 @@ class openstack_project::review_dev (
$storyboard_ssl_cert = '',
$project_config_repo = '',
$projects_config = 'openstack_project/review-dev.projects.ini.erb',
$gerrit_ssh_known_hosts = '',
) {
$java_home = $::lsbdistcodename ? {
@ -60,7 +59,6 @@ class openstack_project::review_dev (
ssh_project_rsa_pubkey_contents => $ssh_project_rsa_pubkey_contents,
ssh_replication_rsa_key_contents => $ssh_replication_rsa_key_contents,
ssh_replication_rsa_pubkey_contents => $ssh_replication_rsa_pubkey_contents,
gerrit_ssh_known_hosts => "${gerrit_ssh_known_hosts} ${gerrit_ssh_host_key}",
email => 'review-dev@openstack.org',
war =>
'http://tarballs.openstack.org/ci/gerrit/gerrit-v2.11.4.22.e0c0f29.war',