Remove QPID ssl package installation

onlyif does not work as it supposed to and it failing Puppet with:
Debug: /Stage[main]/Main/Enable_qpid[qpid]/Exec[install_qpid_ssl]/onlyif: Error: No matching Packages to list

While from Puppet PoV this is valid message, we would need to add special error ignore rule in Packstack
just for this case. Because separate ssl package for QPID won't be used for Juno+, this rule is removed.
Backports to Icehouse- has to have the special error ignore rule instead.

Change-Id: Ieb637094fb89bacb9ef6f1cafd38e1b56d044ef1
Fixes: rhbz#1179859
This commit is contained in:
Martin Mágr
2015-01-15 12:17:27 +01:00
parent ed13378732
commit 496681dd51

View File

@@ -75,17 +75,6 @@ define enable_qpid($enable_ssl = 'n', $enable_auth = 'n') {
ssl_database_password => hiera('CONFIG_AMQP_NSS_CERTDB_PW'),
}
if $enable_ssl {
# If there is qpid-cpp-server-ssl install it
exec { 'install_qpid_ssl':
path => '/usr/bin',
command => 'yum install -y -d 0 -e 0 qpid-cpp-server-ssl',
onlyif => 'yum info qpid-cpp-server-ssl',
before => Service['qpidd'],
require => Package['qpid-cpp-server'],
}
}
if $enable_auth == 'y' {
add_qpid_user { 'qpid_user': }
}
@@ -110,4 +99,3 @@ define add_qpid_user {
require => Package['qpid-cpp-server'],
}
}