Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/339660 )
Change subject: role::pybaltest: fix compilation
......................................................................
role::pybaltest: fix compilation
Change-Id: Ic5c08c1e00daf5dea5810eac8873b686700e2530
---
M modules/profile/manifests/conftool/master.pp
M modules/role/manifests/pybaltest.pp
2 files changed, 7 insertions(+), 1 deletion(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/profile/manifests/conftool/master.pp
b/modules/profile/manifests/conftool/master.pp
index 66988d6..42d0d2e 100644
--- a/modules/profile/manifests/conftool/master.pp
+++ b/modules/profile/manifests/conftool/master.pp
@@ -20,7 +20,7 @@
# We also need to know where the puppet repo is. We cannot require a
profile
# here because the puppet classes are not well structured. TODO: fix this
# and transform the git dir into a parameter
- require ::puppetmaster::gitclone
+ require ::puppetmaster::base_repo
file { '/etc/conftool/data':
ensure => link,
diff --git a/modules/role/manifests/pybaltest.pp
b/modules/role/manifests/pybaltest.pp
index f907e88..67a5d1e 100644
--- a/modules/role/manifests/pybaltest.pp
+++ b/modules/role/manifests/pybaltest.pp
@@ -19,5 +19,11 @@
}
# Install conftool-master for conftool testing
+ class { '::puppetmaster::base_repo':
+ gitdir => '/var/lib/git',
+ gitowner => 'root',
+ }
+
+
include ::profile::conftool::master
}
--
To view, visit https://gerrit.wikimedia.org/r/339660
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5c08c1e00daf5dea5810eac8873b686700e2530
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
