Skip to content

Commit a9eff93

Browse files
authored
Replace 'stahnma-epel' by 'puppet-epel' (jdowning#70)
* Puppetfile.lock: basically just %s/stahnma/puppet/g - while here, removed the dependency declared by 'stahnma-epel' * metadata.json: %s/stahnma/puppet/g, and update its version * medatada.json: add CentOS 8 to the list of supported systems - only that one, because that's the one I used puppet/epel with * version bumped from 2.2.0 to 2.3.0 - based on the way the tags are created; - https://github.com/jdowning/puppet-awscli/tags * FIXTURES_YML: yet another %s/stahnma/puppet/g, with ref update * metadata.json: update Puppet "version_requirement": ">= 3.4.3 <= 6.18" * MANIFEST (init.pp): CentOS 8 gets us pip3, and we need that * metadata.json: quick "--amend" here on Puppet's version support * metadata: Puppet "version_requirement" <= 6.99.0 * Puppetfile.lock: remove empty line * Puppetfile.lock: loose a bit more supported 'epel' version * metadata.json: sync epel's supported version updated on Puppetfile.lock
1 parent cedb098 commit a9eff93

File tree

4 files changed

+12
-13
lines changed

4 files changed

+12
-13
lines changed

.fixtures.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
fixtures:
33
forge_modules:
44
epel:
5-
repo: "stahnma/epel"
6-
ref: "1.2.2"
5+
repo: "puppet/epel"
6+
ref: "3.0.1"
77
concat:
88
repo: "puppetlabs/concat"
99
ref: "4.0.0"

Puppetfile.lock

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@ FORGE
44
puppetlabs-concat (2.2.1)
55
puppetlabs-stdlib (< 5.0.0, >= 4.2.0)
66
puppetlabs-stdlib (4.16.0)
7-
stahnma-epel (1.2.2)
8-
puppetlabs-stdlib (>= 3.0.0)
7+
puppet-epel (3.0.1)
98

109
DEPENDENCIES
1110
puppetlabs-concat (< 5.0.0, >= 2.0.0)
1211
puppetlabs-stdlib (< 5.0.0, >= 4.0.0)
13-
stahnma-epel (< 2.0.0, >= 1.0.0)
14-
12+
puppet-epel (< 3.99.0, >= 3.0.0)

manifests/init.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,14 @@
6868
) inherits awscli::params {
6969

7070
case $provider {
71-
'pip': {
71+
'pip','pip3': {
7272
class { '::awscli::deps':
7373
proxy => $proxy,
7474
}
7575

7676
package { 'awscli':
7777
ensure => $version,
78-
provider => 'pip',
78+
provider => $provider,
7979
install_options => $install_options,
8080
require => [
8181
Package[$pkg_pip],

metadata.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jdowning-awscli",
3-
"version": "2.2.0",
3+
"version": "2.3.0",
44
"author": "Justin Downing",
55
"summary": "Install awscli",
66
"license": "Apache-2.0",
@@ -9,8 +9,8 @@
99
"issues_url": "https://github.com/jdowning/puppet-awscli/issues",
1010
"dependencies": [
1111
{
12-
"name": "stahnma/epel",
13-
"version_requirement": ">= 1.0.0 <2.0.0"
12+
"name": "puppet/epel",
13+
"version_requirement": ">= 3.0.0 <3.99.0"
1414
},
1515
{
1616
"name": "puppetlabs/stdlib",
@@ -35,7 +35,8 @@
3535
"operatingsystemrelease": [
3636
"5",
3737
"6",
38-
"7"
38+
"7",
39+
"8"
3940
]
4041
},
4142
{
@@ -83,7 +84,7 @@
8384
"requirements": [
8485
{
8586
"name": "puppet",
86-
"version_requirement": ">= 3.4.3 < 5.0.0"
87+
"version_requirement": ">= 3.4.3 <= 6.99.0"
8788
}
8889
],
8990
"description": "Install awscli",

0 commit comments

Comments
 (0)