hiera/install_precise.py - Issue 6269682487132160: Issue 2151 - Drop hiera/private in favor of modules/private/hiera

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments.

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Side by Side Diff: hiera/install_precise.py

Issue 6269682487132160: Issue 2151 - Drop hiera/private in favor of modules/private/hiera (Closed)

Patch Set: Created March 17, 2015, 9:06 a.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View unified diff | Download patch

OLD	NEW
1 #!/usr/bin/env python	1 #!/usr/bin/env python

2	2

3 import distutils.spawn	3 import distutils.spawn

4 import io	4 import io

5 import os	5 import os

6 import subprocess	6 import subprocess

7 import sys	7 import sys

8	8

9 if distutils.spawn.find_executable('puppet') \	9 if distutils.spawn.find_executable('puppet') \

10 and distutils.spawn.find_executable('hiera'):	10 and distutils.spawn.find_executable('hiera'):

(...skipping 80 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
91 handle.write(PUPPETLABS_SOURCES)	91 handle.write(PUPPETLABS_SOURCES)

92	92

93 with io.open('/etc/apt/preferences.d/puppetlabs', 'wb') as handle:	93 with io.open('/etc/apt/preferences.d/puppetlabs', 'wb') as handle:

94 handle.write(PUPPETLABS_PREFS)	94 handle.write(PUPPETLABS_PREFS)

95	95

96 subprocess.check_call(['apt-get', '-y', 'update'])	96 subprocess.check_call(['apt-get', '-y', 'update'])

97 subprocess.check_call(['apt-get', '-y', 'install', 'puppet'])	97 subprocess.check_call(['apt-get', '-y', 'install', 'puppet'])

98 subprocess.check_call(['apt-get', '-y', 'install', 'hiera-puppet'])	98 subprocess.check_call(['apt-get', '-y', 'install', 'hiera-puppet'])

99	99

100 if not os.path.exists('/etc/puppet/hiera.yaml'):	100 if not os.path.exists('/etc/puppet/hiera.yaml'):

101 config = os.path.join(os.path.dirname(__file__), 'hiera.yaml')	101 realpath = os.path.realpath(__file__)

	102 dirname = os.path.dirname(realpath)

	103 config = os.path.join(dirname, 'hiera.yaml')
	mathias 2015/03/17 09:28:48 This is actually a bug I encountered and fixed dur This is actually a bug I encountered and fixed during testing, yet it's not related here and published by accident. Will become a separate commit, though. See https://issues.adblockplus.org/ticket/2155#comment:2 --
102 if os.path.exists(config):	104 if os.path.exists(config):

103 os.symlink(config, '/etc/puppet/hiera.yaml')	105 os.symlink(config, '/etc/puppet/hiera.yaml')

OLD	NEW

« no previous file with comments | « hiera/hiera.yaml ('k') | hiera/puppet_node_classifier.rb » ('j') | no next file with comments »