diff --git a/manifests/site.pp b/manifests/site.pp index aab6a993f3..0532fcb745 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -368,6 +368,7 @@ node 'git.openstack.org' { node /^git\d+\.openstack\.org$/ { include openstack_project class { 'openstack_project::git_backend': + project_config_repo => 'https://git.openstack.org/openstack-infra/project-config', vhost_name => 'git.openstack.org', sysadmins => hiera('sysadmins', []), git_gerrit_ssh_key => hiera('gerrit_replication_ssh_rsa_pubkey_contents', 'XXX'), @@ -398,6 +399,7 @@ node 'summit.openstack.org' { # Node-OS: precise node 'storyboard.openstack.org' { class { 'openstack_project::storyboard': + project_config_repo => 'https://git.openstack.org/openstack-infra/project-config', sysadmins => hiera('sysadmins', []), mysql_host => hiera('storyboard_db_host', 'localhost'), mysql_user => hiera('storyboard_db_user', 'username'), diff --git a/modules/openstack_project/manifests/git_backend.pp b/modules/openstack_project/manifests/git_backend.pp index 2540531645..41b3814098 100644 --- a/modules/openstack_project/manifests/git_backend.pp +++ b/modules/openstack_project/manifests/git_backend.pp @@ -22,8 +22,14 @@ class openstack_project::git_backend ( $ssl_cert_file_contents = '', $ssl_key_file_contents = '', $ssl_chain_file_contents = '', - $behind_proxy = false + $behind_proxy = false, + $project_config_repo = '', ) { + + class { 'project_config': + url => $project_config_repo, + } + class { 'openstack_project::server': iptables_public_tcp_ports => [4443, 8080, 29418], sysadmins => $sysadmins, @@ -81,7 +87,8 @@ class openstack_project::git_backend ( owner => 'cgit', group => 'cgit', mode => '0444', - source => 'puppet:///modules/openstack_project/review.projects.yaml', + source => $::project_config::jeepyb_project_file, + require => $::project_config::config_dir, replace => true, } diff --git a/modules/openstack_project/manifests/review.pp b/modules/openstack_project/manifests/review.pp index b334b02226..c7351eb023 100644 --- a/modules/openstack_project/manifests/review.pp +++ b/modules/openstack_project/manifests/review.pp @@ -121,7 +121,7 @@ class openstack_project::review ( 'http://direct.openstack.org/verify/member/', acls_dir => $::project_config::gerrit_acls_dir, notify_impact_file => $::project_config::gerrit_notify_impact_file, - projects_file => $::project_config::gerrit_project_file, + projects_file => $::project_config::jeepyb_project_file, projects_config => 'openstack_project/review.projects.ini.erb', github_username => 'openstack-gerrit', diff --git a/modules/openstack_project/manifests/review_dev.pp b/modules/openstack_project/manifests/review_dev.pp index a45df5fa2f..f5f2e29384 100644 --- a/modules/openstack_project/manifests/review_dev.pp +++ b/modules/openstack_project/manifests/review_dev.pp @@ -56,7 +56,7 @@ class openstack_project::review_dev ( '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::gerrit_project_file, + projects_file => $::project_config::jeepyb_project_file, projects_config => 'openstack_project/review-dev.projects.ini.erb', github_username => 'openstack-gerrit-dev', diff --git a/modules/openstack_project/manifests/storyboard.pp b/modules/openstack_project/manifests/storyboard.pp index c173aa033b..8272d6e609 100644 --- a/modules/openstack_project/manifests/storyboard.pp +++ b/modules/openstack_project/manifests/storyboard.pp @@ -10,8 +10,14 @@ class openstack_project::storyboard( $ssl_cert_file_contents = undef, $ssl_key_file_contents = undef, $ssl_chain_file_contents = undef, - $openid_url = 'https://login.launchpad.net/+openid' + $openid_url = 'https://login.launchpad.net/+openid', + $project_config_repo = '', ) { + + class { 'project_config': + url => $project_config_repo, + } + class { 'openstack_project::server': sysadmins => $sysadmins, iptables_public_tcp_ports => [80, 443], @@ -46,7 +52,8 @@ class openstack_project::storyboard( # Load the projects into the database. class { '::storyboard::load_projects': - source => 'puppet:///modules/openstack_project/review.projects.yaml', + source => $::project_config::jeepyb_project_file, + require => $::project_config::config_dir, } # Load the superusers into the database