openstack
/
tripleo-common
Code Issues Proposed changes

Remove /etc/rabbitmq/rabbitmq.conf 

Currently the rabbitmq container image ships the default rabbitmq
ini-based conf file:
$ podman run -it --net=host --rm -uroot undercloud-0.ctlplane.bgp.ftw:8787/tripleomaster/openstack-rabbitmq:current-tripleo sh -c 'ls -l /etc/rabbitmq/'
  -rw-r--r--. 1 rabbitmq rabbitmq 32393 Mar 9 2020 rabbitmq.conf

$ podman run -it --net=host --rm -uroot undercloud-0.ctlplane.bgp.ftw:8787/tripleomaster/openstack-rabbitmq:current-tripleo sh -c 'head -n5 /etc/rabbitmq/rabbitmq.conf'
  # ======================================
  # RabbitMQ broker section
  # ======================================

  ## Related doc guide: https://rabbitmq.com/configure.html. See

In puppet we instead create /etc/rabbitmq/rabbitmq.config and it still
uses the erlang syntax.  See https://github.com/voxpupuli/puppet-rabbitmq/issues/829 for info.
Even though /etc/rabbitmq/rabbitmq.config and its erlang syntax take
precedence over /etc/rabbitmq/rabbitmq.conf, we should prolly remove the
non used config format from the container

Closes-Bug: #1943731

Change-Id: I2b17c3bc930f5964e19c261db65f79593173fb95
(cherry picked from commit 049f9a9659)
This commit is contained in:
Michele Baldessari 2021-09-15 17:19:47 +02:00
parent f124c39546
commit 6109c05fda
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
container-images/tcib/base/rabbitmq/rabbitmq.yaml
View File

@ -1,6 +1,6 @@
tcib_actions:
- run: bash /usr/local/bin/uid_gid_manage {{ tcib_user }}
- run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
- run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf && rm -f /etc/rabbitmq/rabbitmq.conf
- run: cp /usr/share/openstack-tripleo-common-containers/container-images/kolla/rabbitmq/extend_start.sh /usr/local/bin/kolla_extend_start
- run: chmod 755 /usr/local/bin/kolla_extend_start
- run: ln -s /usr/share/openstack-tripleo-common/healthcheck/rabbitmq /openstack/healthcheck && chmod a+rx /openstack/healthcheck