Append rabbitmq_packages_append contents

The review [1] override the fix later on the jinja template, this review
replace the override by an append, and also check if there is nothing to
append and add an empty list.

Closes-Bug: #1814851

[1] https://review.openstack.org/#/c/634405

Change-Id: I35cbde7e3d44ce071a962cea278680bd5e453ec2
This commit is contained in:
Quique Llorente 2019-02-06 08:38:59 +01:00
parent d115905dbd
commit 72041379db
1 changed files with 6 additions and 7 deletions

View File

@ -152,12 +152,6 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
{% set nova_compute_packages_append = ['openstack-nova-migration', 'openssh-server'] %}
{% set nova_libvirt_packages_append = ['openstack-nova-migration'] %}
# workaround for LP #1814233
# Review https://review.openstack.org/#/c/634365/
# Remove when https://review.openstack.org/#/c/634402/ is merged
{% set rabbitmq_packages_remove = ['rabbitmq-server-3.7.10'] %}
{% set rabbitmq_packages_append = ['rabbitmq-server'] %}
############################ service container footers #########################
{% block aodh_api_footer %}
@ -563,8 +557,13 @@ RUN mkdir -p /openstack && \
# External rabbitmq plugins installation is disabled
{% endblock %}
# workaround for LP #1814233
# Review https://review.openstack.org/#/c/634365/
# Remove when https://review.openstack.org/#/c/634402/ is merged
{% set rabbitmq_packages_remove = ['rabbitmq-server-3.7.10'] %}
{% set rabbitmq_packages_append = [
'pacemaker', 'pacemaker-remote', 'pcs', 'libqb', 'resource-agents'] %}
'rabbitmq-server', 'pacemaker', 'pacemaker-remote', 'pcs', 'libqb', 'resource-agents'] %}
{% block rabbitmq_footer %}
RUN mkdir -p /etc/libqb /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/rabbitmq /openstack/healthcheck && \