Merge "Allow puppet to manage replication keys on review-dev.o.o"
This commit is contained in:
Jenkins
Gerrit Code Review
commit
8e1b08e7e1
@ -91,25 +91,27 @@ node 'review.openstack.org' {
|
||||
# Node-OS: trusty
|
||||
node 'review-dev.openstack.org' {
|
||||
class { 'openstack_project::review_dev':
|
||||
project_config_repo => 'https://git.openstack.org/openstack-infra/project-config',
|
||||
github_oauth_token => hiera('gerrit_dev_github_token', 'XXX'),
|
||||
github_project_username => hiera('github_dev_project_username', 'username'),
|
||||
github_project_password => hiera('github_dev_project_password', 'XXX'),
|
||||
mysql_host => hiera('gerrit_dev_mysql_host', 'localhost'),
|
||||
mysql_password => hiera('gerrit_dev_mysql_password', 'XXX'),
|
||||
email_private_key => hiera('gerrit_dev_email_private_key', 'XXX'),
|
||||
contactstore_appsec => hiera('gerrit_dev_contactstore_appsec', 'XXX'),
|
||||
contactstore_pubkey => hiera('gerrit_dev_contactstore_pubkey', 'XXX'),
|
||||
ssh_dsa_key_contents => hiera('gerrit_dev_ssh_dsa_key_contents', 'XXX'),
|
||||
ssh_dsa_pubkey_contents => hiera('gerrit_dev_ssh_dsa_pubkey_contents', 'XXX'),
|
||||
ssh_rsa_key_contents => hiera('gerrit_dev_ssh_rsa_key_contents', 'XXX'),
|
||||
ssh_rsa_pubkey_contents => hiera('gerrit_dev_ssh_rsa_pubkey_contents', 'XXX'),
|
||||
ssh_project_rsa_key_contents => hiera('gerrit_dev_project_ssh_rsa_key_contents', 'XXX'),
|
||||
ssh_project_rsa_pubkey_contents => hiera('gerrit_dev_project_ssh_rsa_pubkey_contents', 'XXX'),
|
||||
lp_sync_consumer_key => hiera('gerrit_dev_lp_consumer_key', 'XXX'),
|
||||
lp_sync_token => hiera('gerrit_dev_lp_access_token', 'XXX'),
|
||||
lp_sync_secret => hiera('gerrit_dev_lp_access_secret', 'XXX'),
|
||||
sysadmins => hiera('sysadmins', []),
|
||||
project_config_repo => 'https://git.openstack.org/openstack-infra/project-config',
|
||||
github_oauth_token => hiera('gerrit_dev_github_token', 'XXX'),
|
||||
github_project_username => hiera('github_dev_project_username', 'username'),
|
||||
github_project_password => hiera('github_dev_project_password', 'XXX'),
|
||||
mysql_host => hiera('gerrit_dev_mysql_host', 'localhost'),
|
||||
mysql_password => hiera('gerrit_dev_mysql_password', 'XXX'),
|
||||
email_private_key => hiera('gerrit_dev_email_private_key', 'XXX'),
|
||||
contactstore_appsec => hiera('gerrit_dev_contactstore_appsec', 'XXX'),
|
||||
contactstore_pubkey => hiera('gerrit_dev_contactstore_pubkey', 'XXX'),
|
||||
ssh_dsa_key_contents => hiera('gerrit_dev_ssh_dsa_key_contents', 'XXX'),
|
||||
ssh_dsa_pubkey_contents => hiera('gerrit_dev_ssh_dsa_pubkey_contents', 'XXX'),
|
||||
ssh_rsa_key_contents => hiera('gerrit_dev_ssh_rsa_key_contents', 'XXX'),
|
||||
ssh_rsa_pubkey_contents => hiera('gerrit_dev_ssh_rsa_pubkey_contents', 'XXX'),
|
||||
ssh_project_rsa_key_contents => hiera('gerrit_dev_project_ssh_rsa_key_contents', 'XXX'),
|
||||
ssh_project_rsa_pubkey_contents => hiera('gerrit_dev_project_ssh_rsa_pubkey_contents', 'XXX'),
|
||||
ssh_replication_rsa_key_contents => hiera('gerrit_dev_replication_ssh_rsa_key_contents', 'XXX'),
|
||||
ssh_replication_rsa_pubkey_contents => hiera('gerrit_dev_replication_ssh_rsa_pubkey_contents', 'XXX'),
|
||||
lp_sync_consumer_key => hiera('gerrit_dev_lp_consumer_key', 'XXX'),
|
||||
lp_sync_token => hiera('gerrit_dev_lp_access_token', 'XXX'),
|
||||
lp_sync_secret => hiera('gerrit_dev_lp_access_secret', 'XXX'),
|
||||
sysadmins => hiera('sysadmins', []),
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -16,6 +16,9 @@ class openstack_project::review_dev (
|
||||
$ssh_rsa_pubkey_contents = '',
|
||||
$ssh_project_rsa_key_contents = '',
|
||||
$ssh_project_rsa_pubkey_contents = '',
|
||||
# SSH key for outbound ssh-based replication.
|
||||
$ssh_replication_rsa_key_contents='',
|
||||
$ssh_replication_rsa_pubkey_contents='',
|
||||
$lp_sync_consumer_key = '',
|
||||
$lp_sync_token = '',
|
||||
$lp_sync_secret = '',
|
||||
@ -36,44 +39,46 @@ class openstack_project::review_dev (
|
||||
}
|
||||
|
||||
class { 'openstack_project::gerrit':
|
||||
vhost_name => 'review-dev.openstack.org',
|
||||
canonicalweburl => 'https://review-dev.openstack.org/',
|
||||
ssl_cert_file => '/etc/ssl/certs/ssl-cert-snakeoil.pem',
|
||||
ssl_key_file => '/etc/ssl/private/ssl-cert-snakeoil.key',
|
||||
ssl_chain_file => '',
|
||||
ssh_dsa_key_contents => $ssh_dsa_key_contents,
|
||||
ssh_dsa_pubkey_contents => $ssh_dsa_pubkey_contents,
|
||||
ssh_rsa_key_contents => $ssh_rsa_key_contents,
|
||||
ssh_rsa_pubkey_contents => $ssh_rsa_pubkey_contents,
|
||||
ssh_project_rsa_key_contents => $ssh_project_rsa_key_contents,
|
||||
ssh_project_rsa_pubkey_contents => $ssh_project_rsa_pubkey_contents,
|
||||
email => 'review-dev@openstack.org',
|
||||
war =>
|
||||
vhost_name => 'review-dev.openstack.org',
|
||||
canonicalweburl => 'https://review-dev.openstack.org/',
|
||||
ssl_cert_file => '/etc/ssl/certs/ssl-cert-snakeoil.pem',
|
||||
ssl_key_file => '/etc/ssl/private/ssl-cert-snakeoil.key',
|
||||
ssl_chain_file => '',
|
||||
ssh_dsa_key_contents => $ssh_dsa_key_contents,
|
||||
ssh_dsa_pubkey_contents => $ssh_dsa_pubkey_contents,
|
||||
ssh_rsa_key_contents => $ssh_rsa_key_contents,
|
||||
ssh_rsa_pubkey_contents => $ssh_rsa_pubkey_contents,
|
||||
ssh_project_rsa_key_contents => $ssh_project_rsa_key_contents,
|
||||
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,
|
||||
email => 'review-dev@openstack.org',
|
||||
war =>
|
||||
'http://tarballs.openstack.org/ci/gerrit/gerrit-v2.10.2.22.acc615e.war',
|
||||
contactstore => $contactstore,
|
||||
contactstore_appsec => $contactstore_appsec,
|
||||
contactstore_pubkey => $contactstore_pubkey,
|
||||
contactstore_url =>
|
||||
contactstore => $contactstore,
|
||||
contactstore_appsec => $contactstore_appsec,
|
||||
contactstore_pubkey => $contactstore_pubkey,
|
||||
contactstore_url =>
|
||||
'https://review-dev.openstack.org/fakestore',
|
||||
acls_dir => $::project_config::gerrit_acls_dir,
|
||||
notify_impact_file => $::project_config::gerrit_notify_impact_file,
|
||||
projects_file => $::project_config::jeepyb_project_file,
|
||||
projects_config => $projects_config,
|
||||
github_username => 'openstack-gerrit-dev',
|
||||
github_oauth_token => $github_oauth_token,
|
||||
github_project_username => $github_project_username,
|
||||
github_project_password => $github_project_password,
|
||||
mysql_host => $mysql_host,
|
||||
mysql_password => $mysql_password,
|
||||
email_private_key => $email_private_key,
|
||||
sysadmins => $sysadmins,
|
||||
gitweb => false,
|
||||
cgit => true,
|
||||
web_repo_url => 'https://git.openstack.org/cgit/',
|
||||
swift_username => $swift_username,
|
||||
swift_password => $swift_password,
|
||||
replication_force_update => true,
|
||||
replication => [
|
||||
acls_dir => $::project_config::gerrit_acls_dir,
|
||||
notify_impact_file => $::project_config::gerrit_notify_impact_file,
|
||||
projects_file => $::project_config::jeepyb_project_file,
|
||||
projects_config => $projects_config,
|
||||
github_username => 'openstack-gerrit-dev',
|
||||
github_oauth_token => $github_oauth_token,
|
||||
github_project_username => $github_project_username,
|
||||
github_project_password => $github_project_password,
|
||||
mysql_host => $mysql_host,
|
||||
mysql_password => $mysql_password,
|
||||
email_private_key => $email_private_key,
|
||||
sysadmins => $sysadmins,
|
||||
gitweb => false,
|
||||
cgit => true,
|
||||
web_repo_url => 'https://git.openstack.org/cgit/',
|
||||
swift_username => $swift_username,
|
||||
swift_password => $swift_password,
|
||||
replication_force_update => true,
|
||||
replication => [
|
||||
{
|
||||
name => 'github',
|
||||
url => 'git@github.com:',
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user