Merge "Add RabbitFIPS parameter" into stable/wallaby

openstack-archive · May 18, 2022 · 3965818 · 3965818
2 parents 7bffcca + 397603a
commit 3965818
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/deployment/rabbitmq/rabbitmq-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-container-puppet.yaml
@@ -73,6 +73,10 @@ parameters:
       net_ticktime kernel variable.
     default: 15
     type: number
+  RabbitFIPS:
+    type: boolean
+    default: false
+    description: Configures RabbitMQ to run in FIPS mode
   RabbitAdditionalErlArgs:
     description:
       Additional parameters passed to the Erlang subsystem. The string
@@ -223,6 +227,7 @@ outputs:
             # TODO(jaosorior): Remove this once we set a proper default in
             # puppet-tripleo
             tripleo::profile::base::rabbitmq::enable_internal_tls: {get_param: EnableInternalTLS}
+            tripleo::profile::base::rabbitmq::fips_mode: {get_param: RabbitFIPS}
             rabbitmq::collect_statistics_interval: 30000
           -
             if:

diff --git a/releasenotes/notes/add-rabbit-fips-option-ddf5a0d7e37d8e5d.yaml b/releasenotes/notes/add-rabbit-fips-option-ddf5a0d7e37d8e5d.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    RabbitMQ can be configured to run in FIPS mode via the new
+    configuration option RabbitFIPS.  The default value is false.