Skip to content

Commit 39713ae

Browse files
committed
Drop RPMs from being included in tarball
1 parent 5cb07de commit 39713ae

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

manifests/tar_create.pp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,14 @@
1212
Stdlib::Absolutepath $path = $title,
1313
Stdlib::Fqdn $foreman_proxy_fqdn = $certs::foreman_proxy_content::foreman_proxy_fqdn,
1414
) {
15-
$ca_rpms = 'ssl-build/*.noarch.rpm'
1615
$ca_certificates = 'ssl-build/*.crt'
1716

18-
$foreman_proxy_certificate_rpms = "ssl-build/${foreman_proxy_fqdn}/*.noarch.rpm"
1917
$foreman_proxy_certificates = "ssl-build/${foreman_proxy_fqdn}/*.crt"
2018
$foreman_proxy_keys = "ssl-build/${foreman_proxy_fqdn}/*.key"
2119

2220
exec { "generate ${path}":
2321
cwd => '/root',
2422
path => ['/usr/bin', '/bin'],
25-
command => "tar -caf ${path} ${ca_rpms} ${ca_certificates} ${foreman_proxy_certificate_rpms} ${foreman_proxy_certificates} ${foreman_proxy_keys}",
23+
command => "tar -caf ${path} ${ca_certificates} ${foreman_proxy_certificates} ${foreman_proxy_keys}",
2624
}
2725
}

spec/acceptance/foreman_proxy_content_spec.rb

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,8 @@ class { 'certs::foreman_proxy_content':
2626

2727
let(:expected_files_in_tar) do
2828
[
29-
'ssl-build/katello-default-ca-1.0-1.noarch.rpm',
30-
'ssl-build/katello-server-ca-1.0-1.noarch.rpm',
3129
'ssl-build/katello-default-ca.crt',
3230
'ssl-build/katello-server-ca.crt',
33-
'ssl-build/foreman-proxy.example.com/foreman-proxy.example.com-apache-1.0-1.noarch.rpm',
34-
'ssl-build/foreman-proxy.example.com/foreman-proxy.example.com-foreman-client-1.0-1.noarch.rpm',
35-
'ssl-build/foreman-proxy.example.com/foreman-proxy.example.com-foreman-proxy-1.0-1.noarch.rpm',
36-
'ssl-build/foreman-proxy.example.com/foreman-proxy.example.com-foreman-proxy-client-1.0-1.noarch.rpm',
37-
'ssl-build/foreman-proxy.example.com/foreman-proxy.example.com-puppet-client-1.0-1.noarch.rpm',
3831
'ssl-build/foreman-proxy.example.com/foreman-proxy.example.com-apache.crt',
3932
'ssl-build/foreman-proxy.example.com/foreman-proxy.example.com-foreman-client.crt',
4033
'ssl-build/foreman-proxy.example.com/foreman-proxy.example.com-foreman-proxy-client.crt',

0 commit comments

Comments
 (0)