From aff1df708ed825d2b2a8f78ec4f67c1dd53399ab Mon Sep 17 00:00:00 2001
From: Dmitry Teselkin <dteselkin@mirantis.com>
Date: Thu, 6 Nov 2014 18:47:20 +0300
Subject: [PATCH] Pass project_config_repo from single_use_slave

Pass the project_config_repo variable from single_use_slave.pp
manifest to the nested slave_common.pp to be able to set it's
value from parent scripts (e.g. prepare_node.sh)

Change-Id: I3c765a72fd48624cddc6146feb94331b2c764df3
---
 modules/openstack_project/manifests/single_use_slave.pp | 8 +++++---
 modules/openstack_project/manifests/slave_common.pp     | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/openstack_project/manifests/single_use_slave.pp b/modules/openstack_project/manifests/single_use_slave.pp
index eba1f51572..0bc8f354cb 100644
--- a/modules/openstack_project/manifests/single_use_slave.pp
+++ b/modules/openstack_project/manifests/single_use_slave.pp
@@ -17,7 +17,8 @@ class openstack_project::single_use_slave (
   $automatic_upgrades = false,
   $all_mysql_privs = false,
   $enable_unbound = true,
-  $ssh_key = $openstack_project::jenkins_ssh_key
+  $ssh_key = $openstack_project::jenkins_ssh_key,
+  $project_config_repo = 'https://git.openstack.org/openstack-infra/project-config',
 ) inherits openstack_project {
   class { 'openstack_project::template':
     certname            => $certname,
@@ -44,8 +45,9 @@ class openstack_project::single_use_slave (
   }
 
   class { 'openstack_project::slave_common':
-    include_pypy    => $include_pypy,
-    sudo            => $sudo,
+    include_pypy        => $include_pypy,
+    sudo                => $sudo,
+    project_config_repo => $project_config_repo,
   }
 
   if (! $thin) {
diff --git a/modules/openstack_project/manifests/slave_common.pp b/modules/openstack_project/manifests/slave_common.pp
index bb18452d2e..9f93d15735 100644
--- a/modules/openstack_project/manifests/slave_common.pp
+++ b/modules/openstack_project/manifests/slave_common.pp
@@ -5,7 +5,7 @@
 class openstack_project::slave_common(
   $include_pypy = false,
   $sudo         = false,
-  $project_config_repo = 'https://git.openstack.org/openstack-infra/project-config',
+  $project_config_repo = '',
 ){
   vcsrepo { '/opt/requirements':
     ensure   => latest,