Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@

source 'https://rubygems.org'

gem 'puppet', ENV.fetch('PUPPET_GEM_VERSION', '>= 7'), groups: ['development', 'test']
gem 'openvox', ENV.fetch('PUPPET_GEM_VERSION', '>= 8'), groups: ['development', 'test']
gem 'rake'

gem 'kafo_module_lint', {"groups"=>["test"]}
gem 'puppet-lint-spaceship_operator_without_tag-check', '~> 1.0', {"groups"=>["test"]}
gem 'voxpupuli-test', '~> 9.0', {"groups"=>["test"]}
gem 'github_changelog_generator', '>= 1.15.0', {"groups"=>["development"]}
gem 'puppet_metadata', '~> 5.3'
gem 'puppet-blacksmith', '>= 6.0.0', {"groups"=>["development"]}
gem 'voxpupuli-acceptance', '~> 4.1', {"groups"=>["system_tests"]}
gem 'puppetlabs_spec_helper', {"groups"=>["system_tests"]}
gem 'kafo_module_lint', {"groups" => ["test"]}
gem 'puppet-lint-spaceship_operator_without_tag-check', '~> 2.0', {"groups" => ["test"]}
gem 'voxpupuli-test', '~> 14.0', {"groups" => ["test"]}
gem 'github_changelog_generator', '>= 1.15.0', {"groups" => ["development"]}
gem 'puppet_metadata', '~> 6.3'
gem 'puppet-blacksmith', '~> 9.1', {"groups" => ["development"]}
gem 'voxpupuli-acceptance', '~> 4.4', {"groups" => ["system_tests"]}

# vim:ft=ruby
6 changes: 1 addition & 5 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
begin
require 'voxpupuli/test/rake'
rescue LoadError
begin
require 'puppetlabs_spec_helper/rake_tasks'
rescue LoadError
end
end

# load optional tasks for acceptance
Expand All @@ -19,7 +15,7 @@ begin
rescue LoadError
else
# We use fixtures in our modules, which is not the default
task :beaker => 'spec_prep'
task :beaker => 'fixtures:prep'
end

# blacksmith isn't always present, e.g. on Travis with --without development
Expand Down
10 changes: 5 additions & 5 deletions manifests/apache.pp
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
default: {
$http_vhost_name = $pulpcore::apache_http_vhost
$http_fragment = epp('pulpcore/apache-fragment.epp', {
'directories' => [$content_directory],
'directories' => [$content_directory],
})
}
}
Expand Down Expand Up @@ -140,8 +140,8 @@
default: {
$https_vhost_name = $pulpcore::apache_https_vhost
$https_fragment = epp('pulpcore/apache-fragment.epp', {
'directories' => [$content_directory, $api_directory],
'proxy_pass' => [$proxy_pass_static],
'directories' => [$content_directory, $api_directory],
'proxy_pass' => [$proxy_pass_static],
})
}
}
Expand All @@ -167,8 +167,8 @@
# then conflict with the foreman module which doesn't use the selinux module.
if $facts['os']['selinux']['enabled'] {
ensure_resource('selboolean', 'httpd_can_network_connect', {
value => 'on',
persistent => true,
value => 'on',
persistent => true,
})
}
}
Expand Down
4 changes: 2 additions & 2 deletions manifests/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
concat::fragment { 'logging':
target => 'pulpcore settings',
content => epp('pulpcore/settings-logging.py.epp', {
'level' => $pulpcore::log_level,
'loggers' => $loggers,
'level' => $pulpcore::log_level,
'loggers' => $loggers,
}),
order => '02',
}
Expand Down
4 changes: 2 additions & 2 deletions manifests/plugin/rpm.pp
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@

if $keep_changelog_limit or $allow_automatic_unsafe_advisory_conflict_resolution {
$rpm_plugin_config = epp('pulpcore/settings-rpm.py.epp', {
'allow_auacr' => $allow_automatic_unsafe_advisory_conflict_resolution,
'keep_changelog_limit' => $keep_changelog_limit,
'allow_auacr' => $allow_automatic_unsafe_advisory_conflict_resolution,
'keep_changelog_limit' => $keep_changelog_limit,
})
} else {
$rpm_plugin_config = undef
Expand Down
2 changes: 1 addition & 1 deletion spec/spec_helper_acceptance.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'voxpupuli/acceptance/spec_helper_acceptance'

ENV['BEAKER_setfile'] ||= 'centos8-64{hostname=centos8-64.example.com}'
ENV['BEAKER_setfile'] ||= 'centos9-64{hostname=centos9-64.example.com}'

configure_beaker(modules: :fixtures) do |host|
if fact_on(host, 'os.family') == 'RedHat'
Expand Down