diff options
Diffstat (limited to 'puppethost.py')
| -rw-r--r-- | puppethost.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/puppethost.py b/puppethost.py index 82bc87b..e1ce7ef 100644 --- a/puppethost.py +++ b/puppethost.py @@ -39,6 +39,7 @@ defaults = { 'sign': True, 'ssldir': '/etc/puppet/ssl', 'template': '%(ssldir)s/template.spec', + 'pkgprefix': 'host-package-', 'verbose': 1, } @@ -118,7 +119,7 @@ class PuppetHost(object): self.datefmt = '%Y%m%d' self.packages = [] self.tarball = '' - self.tmpdir = tempfile.mkdtemp('', 'puppet-host-') + self.tmpdir = tempfile.mkdtemp('', self.opts['pkgprefix']) self._version = '' def gencert(self): @@ -160,7 +161,7 @@ class PuppetHost(object): def tar(self): self._check_files() - name = 'puppet-%s-%s' % (self.hostname, self.version) + name = '%s%s-%s' % (self.opts['pkgprefix'], self.hostname, self.version) tarball = '%s/%s.tar.gz' % (self.tmpdir, name) if os.path.exists(tarball) and not self.opts['force_tarball']: @@ -198,6 +199,7 @@ class PuppetHost(object): text = text.replace('__VERSION__', self.version) text = text.replace('__RELEASE__', self.opts['release']) text = text.replace('__SSLDIR__', self.opts['destssldir']) + text = text.replace('__PKGPREFIX__', self.opts['pkgprefix']) specfp = open(spec, 'w') specfp.write(text) |