Skip to content

Commit 44f6c82

Browse files
ekohlevgeni
authored andcommitted
Remove Puppet 6+ conditionals in fixtures
We require Puppet 6 anyway, so this will always be true. Also simplifies the mosquitto to be a simple string.
1 parent 3f1f1d8 commit 44f6c82

File tree

1 file changed

+6
-14
lines changed

1 file changed

+6
-14
lines changed

.fixtures.yml

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1+
---
12
fixtures:
23
repositories:
34
apt: 'https://github.com/puppetlabs/puppetlabs-apt'
4-
augeas_core:
5-
repo: 'https://github.com/puppetlabs/puppetlabs-augeas_core'
6-
puppet_version: '>= 6.0.0'
5+
augeas_core: 'https://github.com/puppetlabs/puppetlabs-augeas_core'
76
concat: 'https://github.com/puppetlabs/puppetlabs-concat'
8-
cron_core:
9-
repo: "https://github.com/puppetlabs/puppetlabs-cron_core"
10-
puppet_version: ">= 6.0.0"
7+
cron_core: "https://github.com/puppetlabs/puppetlabs-cron_core"
118
datacat: 'https://github.com/richardc/puppet-datacat'
129
dhcp: 'https://github.com/theforeman/puppet-dhcp'
1310
dns: 'https://github.com/theforeman/puppet-dns'
@@ -21,11 +18,6 @@ fixtures:
2118
tftp: 'https://github.com/theforeman/puppet-tftp'
2219
translate: 'https://github.com/puppetlabs/puppetlabs-translate'
2320
xinetd: 'https://github.com/puppetlabs/puppetlabs-xinetd'
24-
yumrepo_core:
25-
repo: "https://github.com/puppetlabs/puppetlabs-yumrepo_core"
26-
puppet_version: ">= 6.0.0"
27-
sshkeys_core:
28-
repo: "https://github.com/puppetlabs/puppetlabs-sshkeys_core"
29-
puppet_version: ">= 6.0.0"
30-
mosquitto:
31-
repo: "https://github.com/voxpupuli/puppet-mosquitto"
21+
yumrepo_core: "https://github.com/puppetlabs/puppetlabs-yumrepo_core"
22+
sshkeys_core: "https://github.com/puppetlabs/puppetlabs-sshkeys_core"
23+
mosquitto: "https://github.com/voxpupuli/puppet-mosquitto"

0 commit comments

Comments
 (0)