Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refs #36573 - Drop default value for foreman_url #880

Merged
merged 1 commit into from
Aug 7, 2023
Merged

Refs #36573 - Drop default value for foreman_url #880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,7 @@
Boolean $server_strict_variables = $puppet::params::server_strict_variables,
Hash[String, Data] $server_additional_settings = $puppet::params::server_additional_settings,
Boolean $server_foreman = $puppet::params::server_foreman,
Stdlib::HTTPUrl $server_foreman_url = $puppet::params::server_foreman_url,
Optional[Stdlib::HTTPUrl] $server_foreman_url = $puppet::params::server_foreman_url,
Optional[Stdlib::Absolutepath] $server_foreman_ssl_ca = $puppet::params::server_foreman_ssl_ca,
Optional[Stdlib::Absolutepath] $server_foreman_ssl_cert = $puppet::params::server_foreman_ssl_cert,
Optional[Stdlib::Absolutepath] $server_foreman_ssl_key = $puppet::params::server_foreman_ssl_key,
Expand Down
2 changes: 1 addition & 1 deletion manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@
true => '/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet',
false => undef,
}
$server_foreman_url = "https://${lower_fqdn}"
$server_foreman_url = undef
$server_foreman_ssl_ca = undef
$server_foreman_ssl_cert = undef
$server_foreman_ssl_key = undef
Expand Down
2 changes: 1 addition & 1 deletion manifests/server.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@
Boolean $strict_variables = $puppet::server_strict_variables,
Hash[String, Data] $additional_settings = $puppet::server_additional_settings,
Boolean $foreman = $puppet::server_foreman,
Stdlib::HTTPUrl $foreman_url = $puppet::server_foreman_url,
Optional[Stdlib::HTTPUrl] $foreman_url = $puppet::server_foreman_url,
Optional[Stdlib::Absolutepath] $foreman_ssl_ca = $puppet::server_foreman_ssl_ca,
Optional[Stdlib::Absolutepath] $foreman_ssl_cert = $puppet::server_foreman_ssl_cert,
Optional[Stdlib::Absolutepath] $foreman_ssl_key = $puppet::server_foreman_ssl_key,
Expand Down
10 changes: 3 additions & 7 deletions spec/classes/puppet_server_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,15 +154,11 @@
it { should contain_class('puppet::server::puppetserver') }
end

describe 'with uppercase hostname' do
let(:facts) do
override_facts(super(),
networking: {fqdn: 'PUPPETSERVER.example.com'},
)
end
describe 'with server_foreman_url' do
let(:params) { super().merge(server_foreman_url: 'https://foreman.example.com') }

it { should compile.with_all_deps }
it { should contain_class('puppet').with_server_foreman_url('https://puppetserver.example.com') }
it { should contain_class('puppet').with_server_foreman_url('https://foreman.example.com') }
end

describe 'with ip parameter' do
Expand Down Expand Up @@ -488,7 +484,7 @@
)
end

it 'should not sync the crl' do

Check warning on line 487 in spec/classes/puppet_server_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / 7 (Ruby 2.7) 

puppet on centos-7-x86_64 with server_ca_crl_sync => true with server_ca => false and running "puppet apply" should not sync the crl

Failure/Error: should_not contain_file('/etc/custom/puppetlabs/puppet/ssl/crl.pem')
  expected that the catalogue would not contain File[/etc/custom/puppetlabs/puppet/ssl/crl.pem]

Check warning on line 487 in spec/classes/puppet_server_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / 7 (Ruby 2.7) 

puppet on redhat-8-x86_64 with server_ca_crl_sync => true with server_ca => false and running "puppet apply" should not sync the crl

Failure/Error: should_not contain_file('/etc/custom/puppetlabs/puppet/ssl/crl.pem')
  expected that the catalogue would not contain File[/etc/custom/puppetlabs/puppet/ssl/crl.pem]

Check warning on line 487 in spec/classes/puppet_server_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / 7 (Ruby 2.7) 

puppet on redhat-9-x86_64 with server_ca_crl_sync => true with server_ca => false and running "puppet apply" should not sync the crl

Failure/Error: should_not contain_file('/etc/custom/puppetlabs/puppet/ssl/crl.pem')
  expected that the catalogue would not contain File[/etc/custom/puppetlabs/puppet/ssl/crl.pem]

Check warning on line 487 in spec/classes/puppet_server_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / 7 (Ruby 2.7) 

puppet on freebsd-12-amd64 with server_ca_crl_sync => true with server_ca => false and running "puppet apply" should not sync the crl

Failure/Error: should_not contain_file('/etc/custom/puppetlabs/puppet/ssl/crl.pem')
  expected that the catalogue would not contain File[/etc/custom/puppetlabs/puppet/ssl/crl.pem]

Check warning on line 487 in spec/classes/puppet_server_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / 7 (Ruby 2.7) 

puppet on scientific-7-x86_64 with server_ca_crl_sync => true with server_ca => false and running "puppet apply" should not sync the crl

Failure/Error: should_not contain_file('/etc/custom/puppetlabs/puppet/ssl/crl.pem')
  expected that the catalogue would not contain File[/etc/custom/puppetlabs/puppet/ssl/crl.pem]

Check warning on line 487 in spec/classes/puppet_server_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / 7 (Ruby 2.7) 

puppet on fedora-36-x86_64 with server_ca_crl_sync => true with server_ca => false and running "puppet apply" should not sync the crl

Failure/Error: should_not contain_file('/etc/custom/puppetlabs/puppet/ssl/crl.pem')
  expected that the catalogue would not contain File[/etc/custom/puppetlabs/puppet/ssl/crl.pem]

Check warning on line 487 in spec/classes/puppet_server_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / 7 (Ruby 2.7) 

puppet on freebsd-11-amd64 with server_ca_crl_sync => true with server_ca => false and running "puppet apply" should not sync the crl

Failure/Error: should_not contain_file('/etc/custom/puppetlabs/puppet/ssl/crl.pem')
  expected that the catalogue would not contain File[/etc/custom/puppetlabs/puppet/ssl/crl.pem]

Check warning on line 487 in spec/classes/puppet_server_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / 7 (Ruby 2.7) 

puppet on ubuntu-18.04-x86_64 with server_ca_crl_sync => true with server_ca => false and running "puppet apply" should not sync the crl

Failure/Error: should_not contain_file('/etc/custom/puppetlabs/puppet/ssl/crl.pem')
  expected that the catalogue would not contain File[/etc/custom/puppetlabs/puppet/ssl/crl.pem]

Check warning on line 487 in spec/classes/puppet_server_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / 7 (Ruby 2.7) 

puppet on debian-10-x86_64 with server_ca_crl_sync => true with server_ca => false and running "puppet apply" should not sync the crl

Failure/Error: should_not contain_file('/etc/custom/puppetlabs/puppet/ssl/crl.pem')
  expected that the catalogue would not contain File[/etc/custom/puppetlabs/puppet/ssl/crl.pem]

Check warning on line 487 in spec/classes/puppet_server_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / 7 (Ruby 2.7) 

puppet on centos-8-x86_64 with server_ca_crl_sync => true with server_ca => false and running "puppet apply" should not sync the crl

Failure/Error: should_not contain_file('/etc/custom/puppetlabs/puppet/ssl/crl.pem')
  expected that the catalogue would not contain File[/etc/custom/puppetlabs/puppet/ssl/crl.pem]
# https://github.com/puppetlabs/rspec-puppet/issues/37
pending("rspec-puppet always sets $server_facts['servername']")
should_not contain_file('/etc/custom/puppetlabs/puppet/ssl/crl.pem')
Expand Down