Mercurial > repos > other > Puppet

comparison manifests/templates.pp @ 148:d9fcabc75a1e puppet-3.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix pip installations We didn't specify Pip package before so we couldn't bootstrap from cold. Also, and Pip is too clever. If package name is wrong but close enough, Pip installs it anyway but next run Puppet can't find the package because of typo and tells Pip to install it again!
author IBBoard <dev@ibboard.co.uk>
date Sun, 26 Mar 2017 16:12:57 +0100
parents 6cb6dc1f74d4
children 060f81349dd6
comparison
equal deleted inserted replaced
147:6cb6dc1f74d4 148:d9fcabc75a1e
20 :yaml: 20 :yaml:
21 :datadir: /var/lib/hiera 21 :datadir: /var/lib/hiera
22 :hierarchy: common 22 :hierarchy: common
23 :logger: console", 23 :logger: console",
24 } 24 }
25 # Fudge Pip to exist
26 file { '/usr/bin/pip-python':
27 ensure => link,
28 target => '/usr/bin/pip',
29 } -> Package <| provider == 'pip' |>
30 } 25 }
31 26
32 class basevpsnode ( 27 class basevpsnode (
33 $primary_ip, 28 $primary_ip,
34 $secondary_ip, 29 $secondary_ip,
233 file { '/etc/pki/rpm-gpg/RPM-GPG-KEY-webtatic-el7': 228 file { '/etc/pki/rpm-gpg/RPM-GPG-KEY-webtatic-el7':
234 ensure => present, 229 ensure => present,
235 source => 'puppet:///common/RPM-GPG-KEY-webtatic-el7', 230 source => 'puppet:///common/RPM-GPG-KEY-webtatic-el7',
236 before => YumRepo['webtatic'], 231 before => YumRepo['webtatic'],
237 } 232 }
233
234 # Install Pip and symlink it so we can use it as a package provider
235 package { 'python2-pip':
236 ensure => installed;
237 }
238 ->
239 file { '/usr/bin/pip-python':
240 ensure => link,
241 target => '/usr/bin/pip',
242 } -> Package <| provider == 'pip' |>
238 } 243 }
239 244
240 class tools { 245 class tools {
241 $packages = [ 'sqlite', 'bash-completion', 'nano', 'bzip2', 'mlocate', 'patch' ] 246 $packages = [ 'sqlite', 'bash-completion', 'nano', 'bzip2', 'mlocate', 'patch' ]
242 package { $packages: 247 package { $packages: