Merge "[rabbitmq] Set password for guest user rabbitmq"

This commit is contained in:
Zuul 2024-09-17 00:20:33 +00:00 committed by Gerrit Code Review
commit b7fd733551
6 changed files with 19 additions and 2 deletions

View File

@ -15,6 +15,6 @@ apiVersion: v1
appVersion: v3.12.0
description: OpenStack-Helm RabbitMQ
name: rabbitmq
version: 0.1.39
version: 0.1.40
home: https://github.com/rabbitmq/rabbitmq-server
...

View File

@ -26,6 +26,7 @@ import re
user = os.environ['RABBITMQ_ADMIN_USERNAME']
password = os.environ['RABBITMQ_ADMIN_PASSWORD']
guest_password = os.environ['RABBITMQ_GUEST_PASSWORD']
output_file = os.environ['RABBITMQ_DEFINITION_FILE']
def hash_rabbit_password(password):
@ -42,7 +43,14 @@ output = {
"password_hash": hash_rabbit_password(password),
"hashing_algorithm": "rabbit_password_hashing_sha512",
"tags": "administrator"
}]
},
{
"name": "guest",
"password_hash": hash_rabbit_password(guest_password),
"hashing_algorithm": "rabbit_password_hashing_sha512",
"tags": "administrator"
}
]
}
if 'RABBITMQ_USERS' in os.environ:

View File

@ -29,4 +29,5 @@ type: Opaque
data:
RABBITMQ_ADMIN_USERNAME: {{ $envAll.Values.endpoints.oslo_messaging.auth.user.username | b64enc }}
RABBITMQ_ADMIN_PASSWORD: {{ $envAll.Values.endpoints.oslo_messaging.auth.user.password | b64enc }}
RABBITMQ_GUEST_PASSWORD: {{ $envAll.Values.endpoints.oslo_messaging.auth.guest.password | b64enc }}
{{- end }}

View File

@ -144,6 +144,11 @@ spec:
secretKeyRef:
name: {{ printf "%s-%s" $envAll.deployment_name "admin-user" | quote }}
key: RABBITMQ_ADMIN_PASSWORD
- name: RABBITMQ_GUEST_PASSWORD
valueFrom:
secretKeyRef:
name: {{ printf "%s-%s" $envAll.deployment_name "admin-user" | quote }}
key: RABBITMQ_GUEST_PASSWORD
- name: RABBITMQ_DEFINITION_FILE
value: "{{ index $envAll.Values.conf.rabbitmq "management.load_definitions" }}"
{{- if .Values.conf.users }}

View File

@ -390,6 +390,8 @@ endpoints:
user:
username: rabbitmq
password: password
guest:
password: password
hosts:
default: rabbitmq
# NOTE(portdirect): the public host is only used to the management WUI

View File

@ -39,4 +39,5 @@ rabbitmq:
- 0.1.37 Update rabbitmq readiness/liveness command
- 0.1.38 Do not use hardcoded username in rabbitmq chown container
- 0.1.39 Allow to bootstrap rabbitmq with initial config
- 0.1.40 Set password for guest user rabbitmq
...