Skip to content

Commit f19f805

Browse files
committed
Only setting param for puppet versions >= 3.6.1
1 parent 5b994e0 commit f19f805

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

manifests/init.pp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11

22
class pip {
3+
4+
if versioncmp($::puppetversion,'3.6.1') >= 0 {
5+
Package {
6+
allow_virtual => true,
7+
}
8+
}
9+
10+
ensure_packages(['curl'])
11+
312
ensure_resource('pip::installation', ['2.6', '2.7', '3.3', '3.4'])
413
}

manifests/installation.pp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
$python_version = $title,
44
) {
55

6-
ensure_packages(['curl'], { allow_virtual => true })
7-
86
$get_pip_url = 'https://raw.githubusercontent.com/pypa/pip/1.5.6/contrib/get-pip.py'
97

108
Exec {

0 commit comments

Comments
 (0)