Skip to content

Commit 16824ac

Browse files
authored
refresh rabbitmqadmin script upon package upgrade or downgrade (#897)
Fixes #804
1 parent 728f886 commit 16824ac

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

manifests/init.pp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -540,6 +540,9 @@
540540
if $admin_enable and $service_manage {
541541
include 'rabbitmq::install::rabbitmqadmin'
542542

543+
# Trigger upgrade of rabbitmqadmin on package upgrade (Issue #804)
544+
Class['rabbitmq::install'] ~> Class['rabbitmq::install::rabbitmqadmin']
545+
543546
Class['rabbitmq::service'] -> Class['rabbitmq::install::rabbitmqadmin']
544547
Class['rabbitmq::install::rabbitmqadmin'] -> Rabbitmq_exchange<| |>
545548
}

manifests/install/rabbitmqadmin.pp

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,24 @@
4040
}
4141

4242
if !($rabbitmq::use_config_file_for_plugins) {
43-
$rabbitmqadmin_archive_require = [Class['rabbitmq::service'], Rabbitmq_plugin['rabbitmq_management']]
43+
$rabbitmqadmin_archive_require = [
44+
Class['rabbitmq::service'],
45+
Rabbitmq_plugin['rabbitmq_management'],
46+
Exec['remove_old_rabbitmqadmin_on_upgrade']
47+
]
4448
} else {
45-
$rabbitmqadmin_archive_require = [Class['rabbitmq::service'], File['enabled_plugins']]
49+
$rabbitmqadmin_archive_require = [
50+
Class['rabbitmq::service'],
51+
File['enabled_plugins'],
52+
Exec['remove_old_rabbitmqadmin_on_upgrade']
53+
]
54+
}
55+
56+
Exec { 'remove_old_rabbitmqadmin_on_upgrade':
57+
path => ['/bin','/usr/bin','/sbin','/usr/sbin'],
58+
command => "rm ${rabbitmq::rabbitmq_home}/rabbitmqadmin",
59+
onlyif => ["test -f ${rabbitmq::rabbitmq_home}/rabbitmqadmin"],
60+
refreshonly => true,
4661
}
4762

4863
archive { 'rabbitmqadmin':

0 commit comments

Comments
 (0)