Commit 52976943a1b67267eec41e48a5640d38ae153346
1 parent
977b8443
Exists in
master
and in
39 other branches
Fixed syntax issues
Showing
1 changed file
with
16 additions
and
16 deletions
Show diff stats
puppet/bootstrap.py
@@ -20,22 +20,22 @@ PUPPET_DIR = os.path.join(os.path.dirname(__file__)) | @@ -20,22 +20,22 @@ PUPPET_DIR = os.path.join(os.path.dirname(__file__)) | ||
20 | MODULES_FILE_PATH = os.path.join(PUPPET_DIR, 'modules.txt') | 20 | MODULES_FILE_PATH = os.path.join(PUPPET_DIR, 'modules.txt') |
21 | 21 | ||
22 | DIST_CMD = { | 22 | DIST_CMD = { |
23 | - 'ubuntu': [ | ||
24 | - {'pkg_manager': 'apt-get'}, | ||
25 | - {'pkg_flags': '-y'}, | ||
26 | - {'rep_manager': 'dpkg'}, | ||
27 | - {'rep_flags': '-i'}, | ||
28 | - {'puppet_repo': 'https://apt.puppetlabs.com/'}, | ||
29 | - {'puppet_pkg': 'puppetlabs-release-%s.deb'}, | ||
30 | - ], | ||
31 | - 'centos': [ | ||
32 | - {'pkg_manager': 'yum'}, | ||
33 | - {'pkg_flags': '-y'}, | ||
34 | - {'rep_manager': 'rpm'}, | ||
35 | - {'rep_flags': '-ivh'}, | ||
36 | - {'puppet_repo': 'http://yum.puppetlabs.com/'}, | ||
37 | - {'puppet_pkg': 'puppetlabs-release-el-%s.noarch.rpm'}, | ||
38 | - ], | 23 | + 'ubuntu': { |
24 | + 'pkg_manager': 'apt-get', | ||
25 | + 'pkg_flags': '-y', | ||
26 | + 'rep_manager': 'dpkg', | ||
27 | + 'rep_flags': '-i', | ||
28 | + 'puppet_repo': 'https://apt.puppetlabs.com/', | ||
29 | + 'puppet_pkg': 'puppetlabs-release-%s.deb', | ||
30 | + }, | ||
31 | + 'centos': { | ||
32 | + 'pkg_manager': 'yum', | ||
33 | + 'pkg_flags': '-y', | ||
34 | + 'rep_manager': 'rpm', | ||
35 | + 'rep_flags': '-ivh', | ||
36 | + 'puppet_repo': 'http://yum.puppetlabs.com/', | ||
37 | + 'puppet_pkg': 'puppetlabs-release-el-%s.noarch.rpm', | ||
38 | + }, | ||
39 | } | 39 | } |
40 | 40 | ||
41 | 41 |