diff --git a/manifests/site.pp b/manifests/site.pp index 5f06d2772e..5e6fc2725f 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -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'), diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp index 17fa4b9e72..df5b4d2fb1 100644 --- a/modules/openstack_project/manifests/gerrit.pp +++ b/modules/openstack_project/manifests/gerrit.pp @@ -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, diff --git a/modules/openstack_project/manifests/review.pp b/modules/openstack_project/manifests/review.pp index 92239fdabb..031383ba7a 100644 --- a/modules/openstack_project/manifests/review.pp +++ b/modules/openstack_project/manifests/review.pp @@ -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', diff --git a/modules/openstack_project/manifests/review_dev.pp b/modules/openstack_project/manifests/review_dev.pp index 71d26684fb..48caad6e5b 100644 --- a/modules/openstack_project/manifests/review_dev.pp +++ b/modules/openstack_project/manifests/review_dev.pp @@ -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',