Skip to content

Commit 5d78745

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 0567194 + be8144a commit 5d78745

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

manifests/init.pp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
$group_ensure = $gridinit::params::group_ensure,
5757
$gid = $gridinit::params::gid,
5858
$package_ensure = $gridinit::params::package_ensure,
59-
$package_provider = $gridinit::params::package_provider,
6059
$packages_names = $gridinit::params::packages_names,
6160
$logfile_maxbytes = $gridinit::params::logfile_maxbytes,
6261
$logfile_backups = $gridinit::params::logfile_backups,

manifests/install.pp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
package { $gridinit::packages_names:
1515
ensure => $gridinit::package_ensure,
16-
provider => $gridinit::package_provider,
1716
allow_virtual => false,
1817
install_options => $package_install_options,
1918
}

manifests/params.pp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
case $::osfamily {
1010
'Debian': {
1111
$libdir = "${prefixdir}/lib"
12-
$package_provider = 'apt'
1312
$packages_names = ['openio-gridinit']
1413
$package_install_options = '--force-yes'
1514
}
@@ -18,9 +17,8 @@
1817
'x86_64': { $libdir = "${prefixdir}/lib64" }
1918
default: { $libdir = "${prefixdir}/lib" }
2019
}
21-
$package_provider = 'yum'
2220
$packages_names = ['openio-gridinit','openio-gridinit-utils']
23-
$package_install_options = ''
21+
$package_install_options = undef
2422
}
2523
default: { fail("osfamily $::osfamily not supported.") }
2624
}

metadata.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "openio-gridinit",
3-
"version": "1.1.0",
3+
"version": "1.1.1",
44
"author": "Romain Acciari",
55
"summary": "Puppet module for gridinit from OpenIO",
66
"license": "Apache-2.0",
@@ -16,9 +16,17 @@
1616
{
1717
"operatingsystem": "CentOS",
1818
"operatingsystemrelease": [ "7" ]
19+
},
20+
{
21+
"operatingsystem": "Debian",
22+
"operatingsystemrelease": [ "8" ]
23+
},
24+
{
25+
"operatingsystem": "Ubuntu",
26+
"operatingsystemrelease": [ "14.04" ]
1927
}
2028
],
2129
"dependencies": [
22-
{ "name": "puppetlabs/stdlib", "version_requirement": ">= 4.4.0 <5.0.0" }
30+
{ "name": "puppetlabs/stdlib", "version_requirement": ">= 4.6.0 <5.0.0" }
2331
]
2432
}

0 commit comments

Comments
 (0)