Skip to content

Commit e0b7cb9

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Enabling support for Thales Luna user id and group id."
2 parents acbaec3 + d85bc28 commit e0b7cb9

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

docker/barbican/barbican-base/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
77

88
{% import "macros.j2" as macros with context %}
99

10-
{{ macros.configure_user(name='barbican', groups='nfast') }}
10+
{{ macros.configure_user(name='barbican', groups='nfast,hsmusers') }}
1111

1212
{{ macros.install_packages(barbican_base_packages | customizable("packages")) }}
1313

kolla/common/users.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,5 +341,9 @@
341341
'opensearch-dashboards-user': {
342342
'uid': 42492,
343343
'gid': 42492,
344+
},
345+
'hsmusers-user': {
346+
'uid': 42493, # This is not used, but the group ID is required.
347+
'gid': 42493,
344348
}
345349
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
fixes:
3+
- |
4+
Fixes a bug with Thales Luna HSM deployments.
5+
The new client software version requires the use of a specific group
6+
called "hsmusers", and for consistency reasons, we are specifying
7+
both, the user id and the group id, and inserting the Barbican username
8+
inside of such a group.
9+
More information can be found at
10+
`LP#Luna <https://www.thalesdocs.com/gphsm/luna/7/docs/pci/Content/install/client_install/linux_install.htm>`__

0 commit comments

Comments
 (0)