Index: hiera/install_precise.py |
=================================================================== |
--- a/hiera/install_precise.py |
+++ b/hiera/install_precise.py |
@@ -1,4 +1,4 @@ |
-#!/usr/bin/env python |
+#!/usr/bin/env python |
import distutils.spawn |
import io |
@@ -8,7 +8,7 @@ |
if distutils.spawn.find_executable('puppet') \ |
and distutils.spawn.find_executable('hiera'): |
- sys.exit(os.EX_OK) |
+ sys.exit(os.EX_OK) |
PUPPETLABS_SOURCES = ''' |
deb http://apt.puppetlabs.com precise main |
@@ -19,11 +19,6 @@ |
# or later release (which is not available in precise) if not pinned here |
Package: puppet puppet-common |
Pin: version 2.7.26-* |
-Pin-Priority: 501 |
- |
-# See https://issues.adblockplus.org/ticket/3706#comment:4 |
-Package: facter |
-Pin: version 1.* |
Pin-Priority: 501''' |
PUPPETLABS_GPG_KEY = ''' |
@@ -93,10 +88,10 @@ |
add_key_process.communicate(PUPPETLABS_GPG_KEY) |
with io.open('/etc/apt/sources.list.d/puppetlabs.list', 'wb') as handle: |
- handle.write(PUPPETLABS_SOURCES) |
+ handle.write(PUPPETLABS_SOURCES) |
with io.open('/etc/apt/preferences.d/puppetlabs', 'wb') as handle: |
- handle.write(PUPPETLABS_PREFS) |
+ handle.write(PUPPETLABS_PREFS) |
subprocess.check_call(['apt-get', '-y', 'update']) |
subprocess.check_call(['apt-get', '-y', 'install', |
@@ -104,8 +99,8 @@ |
'puppet', 'puppet-common', 'hiera-puppet']) |
if not os.path.exists('/etc/puppet/hiera.yaml'): |
- realpath = os.path.realpath(__file__) |
- dirname = os.path.dirname(realpath) |
- config = os.path.join(dirname, 'hiera.yaml') |
- if os.path.exists(config): |
- os.symlink(config, '/etc/puppet/hiera.yaml') |
+ realpath = os.path.realpath(__file__) |
+ dirname = os.path.dirname(realpath) |
+ config = os.path.join(dirname, 'hiera.yaml') |
+ if os.path.exists(config): |
+ os.symlink(config, '/etc/puppet/hiera.yaml') |