Giuseppe Lavagetto has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/370625 )

Change subject: Copy over the puppetdb configuration if present
......................................................................


Copy over the puppetdb configuration if present

Change-Id: I525850947910276b938a9aa5f83db860a12d5a24
---
M puppet_compiler/prepare.py
M setup.py
2 files changed, 8 insertions(+), 1 deletion(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/puppet_compiler/prepare.py b/puppet_compiler/prepare.py
index c63dfd1..5faf5a5 100644
--- a/puppet_compiler/prepare.py
+++ b/puppet_compiler/prepare.py
@@ -96,6 +96,13 @@
 
         shutil.copytree(os.path.join(self.puppet_var, 'ssl'),
                         os.path.join(src, 'ssl'))
+        puppetdb_conf = os.path.join(self.puppet_src, 'puppetdb.conf')
+        if os.path.isfile(puppetdb_conf):
+            _log.debug('Copying the puppetdb config file')
+            shutil.copy(
+                puppetdb_conf,
+                os.path.join(src, 'puppetdb.conf')
+            )
 
     @staticmethod
     def _copy_hiera(dirname, realm):
diff --git a/setup.py b/setup.py
index 7e45c14..c90625c 100755
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
 
 setup(
     name='puppet_compiler',
-    version='0.3.1',
+    version='0.3.2',
     description='Tools to compile puppet catalogs as a service',
     author='Joe',
     author_email='glavage...@wikimedia.org',

-- 
To view, visit https://gerrit.wikimedia.org/r/370625
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I525850947910276b938a9aa5f83db860a12d5a24
Gerrit-PatchSet: 4
Gerrit-Project: operations/software/puppet-compiler
Gerrit-Branch: master
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

Reply via email to