openstack
/
charm-rabbitmq-server
Code Issues Proposed changes

Merge "Install python3-croniter for nrpe checks"

This commit is contained in:
Zuul 2021-08-12 15:48:03 +00:00 committed by Gerrit Code Review
parent b13fbf761a 38e1b4ed35
commit 0b136c10ad
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hooks/rabbit_utils.py
View File

@ -93,7 +93,8 @@ from charmhelpers.fetch import (
from charmhelpers.fetch import get_upstream_version
PACKAGES = ['rabbitmq-server', 'python3-amqplib', 'lockfile-progs']
PACKAGES = ['rabbitmq-server', 'python3-amqplib', 'lockfile-progs',
'python3-croniter']
VERSION_PACKAGE = 'rabbitmq-server'

8
hooks/rabbitmq_server_relations.py
View File

@ -654,9 +654,13 @@ def upgrade_charm():
# for the check_rabbitmq.py script, python3-amqplib needs to be installed;
# if previous version was a python2 version of the charm this won't happen
# unless the source is changed. Ensure it is installed here if needed.
# LP:#1928802 - also include python3-croniter as its needed for
# check_rabbitmq_queues.py as of change ab79c3ee
apt_update(fatal=True)
if filter_installed_packages(['python3-amqplib']):
apt_install(['python3-amqplib'], fatal=True)
missing_packages = filter_installed_packages(['python3-amqplib',
'python3-croniter'])
if missing_packages:
apt_install(missing_packages, fatal=True)
MAN_PLUGIN = 'rabbitmq_management'