Giuseppe Lavagetto has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370624 )
Change subject: Remove templatedir from puppet compilation options. ...................................................................... Remove templatedir from puppet compilation options. Change-Id: Iba37502eae82a7cc9d047e1cffd2e06039beb484 --- M puppet_compiler/puppet.py M puppet_compiler/tests/test_puppet.py 2 files changed, 0 insertions(+), 5 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/puppet_compiler/puppet.py b/puppet_compiler/puppet.py index f10c8db..e33dfd5 100644 --- a/puppet_compiler/puppet.py +++ b/puppet_compiler/puppet.py @@ -19,13 +19,11 @@ privdir = os.path.join(basedir, 'private') env['RUBYLIB'] = os.path.join(srcdir, 'modules/wmflib/lib/') - tpldir = os.path.join(srcdir, 'templates') cmd = ['puppet', 'master', '--vardir=%s' % vardir, '--modulepath=%s:%s' % (os.path.join(privdir, 'modules'), os.path.join(srcdir, 'modules')), '--confdir=%s' % srcdir, - '--templatedir=%s' % tpldir, '--trusted_node_data', '--compile=%s' % hostname, '--color=false' diff --git a/puppet_compiler/tests/test_puppet.py b/puppet_compiler/tests/test_puppet.py index f77d3c1..89849ff 100644 --- a/puppet_compiler/tests/test_puppet.py +++ b/puppet_compiler/tests/test_puppet.py @@ -30,7 +30,6 @@ '--modulepath=%(basedir)s/private/modules:' '%(basedir)s/src/modules' % {'basedir': FHS.prod_dir}, '--confdir=%s/%s' % (FHS.prod_dir, 'src'), - '--templatedir=%s/%s' % (FHS.prod_dir, 'src/templates'), '--trusted_node_data', '--compile=test.codfw.wmnet', '--color=false'], @@ -53,7 +52,6 @@ '--modulepath=%(basedir)s/private/modules:' '%(basedir)s/src/modules' % {'basedir': FHS.change_dir}, '--confdir=%s/%s' % (FHS.change_dir, 'src'), - '--templatedir=%s/%s' % (FHS.change_dir, 'src/templates'), '--trusted_node_data', '--compile=test.codfw.wmnet', '--color=false'], @@ -84,7 +82,6 @@ '--modulepath=%(basedir)s/private/modules:' '%(basedir)s/src/modules' % {'basedir': FHS.prod_dir}, '--confdir=%s/%s' % (FHS.prod_dir, 'src'), - '--templatedir=%s/%s' % (FHS.prod_dir, 'src/templates'), '--trusted_node_data', '--compile=test.codfw.wmnet', '--color=false', '--dummy'], -- To view, visit https://gerrit.wikimedia.org/r/370624 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iba37502eae82a7cc9d047e1cffd2e06039beb484 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