opendev/system-config
Code Issues Proposed changes

Merge "Pull o_p::server out of gerrit role"

Browse Source
This commit is contained in:
Jenkins 2015-11-19 22:06:22 +00:00 committed by Gerrit Code Review
commit 6b993dcf4d
4 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/site.pp
View File

@ -53,6 +53,11 @@ node default {
# Node-OS: precise # Node-OS: precise
# Node-OS: trusty # Node-OS: trusty
node 'review.openstack.org' { node 'review.openstack.org' {
class { 'openstack_project::server':
iptables_public_tcp_ports => [80, 443, 29418],
sysadmins => hiera('sysadmins', []),
}
class { 'openstack_project::review': class { 'openstack_project::review':
project_config_repo => 'https://git.openstack.org/openstack-infra/project-config', project_config_repo => 'https://git.openstack.org/openstack-infra/project-config',
github_oauth_token => hiera('gerrit_github_token'), github_oauth_token => hiera('gerrit_github_token'),
@ -83,7 +88,6 @@ node 'review.openstack.org' {
lp_sync_secret => hiera('gerrit_lp_access_secret'), lp_sync_secret => hiera('gerrit_lp_access_secret'),
contactstore_appsec => hiera('gerrit_contactstore_appsec'), contactstore_appsec => hiera('gerrit_contactstore_appsec'),
contactstore_pubkey => hiera('gerrit_contactstore_pubkey'), contactstore_pubkey => hiera('gerrit_contactstore_pubkey'),
sysadmins => hiera('sysadmins', []),
swift_username => hiera('swift_store_user', 'username'), swift_username => hiera('swift_store_user', 'username'),
swift_password => hiera('swift_store_key'), swift_password => hiera('swift_store_key'),
} }
@ -91,6 +95,12 @@ node 'review.openstack.org' {
# Node-OS: trusty # Node-OS: trusty
node 'review-dev.openstack.org' { node 'review-dev.openstack.org' {
class { 'openstack_project::server':
iptables_public_tcp_ports => [80, 443, 29418],
sysadmins => hiera('sysadmins', []),
afs => true,
}
class { 'openstack_project::review_dev': class { 'openstack_project::review_dev':
project_config_repo => 'https://git.openstack.org/openstack-infra/project-config', project_config_repo => 'https://git.openstack.org/openstack-infra/project-config',
github_oauth_token => hiera('gerrit_dev_github_token'), github_oauth_token => hiera('gerrit_dev_github_token'),
@ -112,7 +122,6 @@ node 'review-dev.openstack.org' {
lp_sync_consumer_key => hiera('gerrit_dev_lp_consumer_key'), lp_sync_consumer_key => hiera('gerrit_dev_lp_consumer_key'),
lp_sync_token => hiera('gerrit_dev_lp_access_token'), lp_sync_token => hiera('gerrit_dev_lp_access_token'),
lp_sync_secret => hiera('gerrit_dev_lp_access_secret'), lp_sync_secret => hiera('gerrit_dev_lp_access_secret'),
sysadmins => hiera('sysadmins', []),
} }
} }

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

@ -64,7 +64,6 @@ class openstack_project::gerrit (
$cla_id = '2', $cla_id = '2',
$cla_name = 'ICLA', $cla_name = 'ICLA',
$testmode = false, $testmode = false,
$sysadmins = [],
$swift_username = '', $swift_username = '',
$swift_password = '', $swift_password = '',
$gitweb = true, $gitweb = true,
@ -72,13 +71,7 @@ class openstack_project::gerrit (
$web_repo_url = '', $web_repo_url = '',
$web_repo_url_encode = false, $web_repo_url_encode = false,
$secondary_index = true, $secondary_index = true,
$afs = false,
) { ) {
class { 'openstack_project::server':
iptables_public_tcp_ports => [80, 443, 29418],
sysadmins => $sysadmins,
afs => $afs,
}
class { 'jeepyb::openstackwatch': class { 'jeepyb::openstackwatch':
projects => [ projects => [

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

@ -76,7 +76,6 @@ class openstack_project::review (
$contactstore = true, $contactstore = true,
$contactstore_appsec='', $contactstore_appsec='',
$contactstore_pubkey='', $contactstore_pubkey='',
$sysadmins = [],
# For openstackwatch. # For openstackwatch.
$swift_username = '', $swift_username = '',
$swift_password = '', $swift_password = '',
@ -133,7 +132,6 @@ class openstack_project::review (
mysql_password => $mysql_password, mysql_password => $mysql_password,
email_private_key => $email_private_key, email_private_key => $email_private_key,
token_private_key => $token_private_key, token_private_key => $token_private_key,
sysadmins => $sysadmins,
swift_username => $swift_username, swift_username => $swift_username,
swift_password => $swift_password, swift_password => $swift_password,
replication_force_update => true, replication_force_update => true,

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

@ -22,7 +22,6 @@ class openstack_project::review_dev (
$lp_sync_consumer_key = '', $lp_sync_consumer_key = '',
$lp_sync_token = '', $lp_sync_token = '',
$lp_sync_secret = '', $lp_sync_secret = '',
$sysadmins = [],
$swift_username = '', $swift_username = '',
$swift_password = '', $swift_password = '',
$project_config_repo = '', $project_config_repo = '',
@ -71,7 +70,6 @@ class openstack_project::review_dev (
mysql_host => $mysql_host, mysql_host => $mysql_host,
mysql_password => $mysql_password, mysql_password => $mysql_password,
email_private_key => $email_private_key, email_private_key => $email_private_key,
sysadmins => $sysadmins,
gitweb => false, gitweb => false,
cgit => true, cgit => true,
web_repo_url => 'https://git.openstack.org/cgit/', web_repo_url => 'https://git.openstack.org/cgit/',
@ -104,7 +102,6 @@ class openstack_project::review_dev (
}, },
], ],
require => $::project_config::config_dir, require => $::project_config::config_dir,
afs => true,
} }
gerrit::plugin { 'javamelody': gerrit::plugin { 'javamelody':