From 1c0b2915f4d8d5cd490b31472ae4cdeb6d3a4a42 Mon Sep 17 00:00:00 2001 From: Ricardo Carrillo Cruz Date: Fri, 31 Oct 2014 16:34:55 +0100 Subject: [PATCH] Expose projects_config parameter in review/review_dev classes The value for that parameter is hardcoded in a nested class, it should be defined in the outer class to allow user defined value. Change-Id: I1715d6a6cff52b9cc224e360104ef9438b6dcf30 Closes-Bug: 1388144 --- modules/openstack_project/manifests/review.pp | 4 ++-- modules/openstack_project/manifests/review_dev.pp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/openstack_project/manifests/review.pp b/modules/openstack_project/manifests/review.pp index c7351eb023..76c97b9bbe 100644 --- a/modules/openstack_project/manifests/review.pp +++ b/modules/openstack_project/manifests/review.pp @@ -80,6 +80,7 @@ class openstack_project::review ( $swift_username = '', $swift_password = '', $project_config_repo = '', + $projects_config = 'openstack_project/review.projects.ini.erb', ) { class { 'project_config': @@ -122,8 +123,7 @@ class openstack_project::review ( 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 => - 'openstack_project/review.projects.ini.erb', + projects_config => $projects_config, github_username => 'openstack-gerrit', github_oauth_token => $github_oauth_token, github_project_username => $github_project_username, diff --git a/modules/openstack_project/manifests/review_dev.pp b/modules/openstack_project/manifests/review_dev.pp index f5f2e29384..4dfe457d38 100644 --- a/modules/openstack_project/manifests/review_dev.pp +++ b/modules/openstack_project/manifests/review_dev.pp @@ -23,6 +23,7 @@ class openstack_project::review_dev ( $swift_username = '', $swift_password = '', $project_config_repo = '', + $projects_config = 'openstack_project/review-dev.projects.ini.erb', ) { realize ( @@ -57,8 +58,7 @@ class openstack_project::review_dev ( 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 => - 'openstack_project/review-dev.projects.ini.erb', + projects_config => $projects_config, github_username => 'openstack-gerrit-dev', github_oauth_token => $github_oauth_token, github_project_username => $github_project_username,