Fixes for #2985 and #2966

ansible/playbooks/roles/applications/templates/rabbitmq/03-rabbitmq.yml.j2

@@ -30,7 +30,7 @@ metadata:
   namespace: {{ namespace_name }}
 data:
   enabled_plugins: |
-      [rabbitmq_management,rabbitmq_peer_discovery_k8s].
+      [{% for plugin in rabbitmq_plugins %}{{ plugin }}{% if not loop.last %},{% endif %}{% endfor %}].
   rabbitmq.conf: |
       listeners.tcp.default = {{ amqp_port }}
       # To allow custom configs like vm_memory_high_watermark define it via custom_configurations in data.yaml

docs/changelogs/CHANGELOG-2.0.md

@@ -9,6 +9,7 @@
 - [#2812](https://github.com/epiphany-platform/epiphany/issues/2812) - Extend K8s config validation
 - [#2950](https://github.com/epiphany-platform/epiphany/issues/2950) - CLI refactor to make it more consistant
 - [#2844](https://github.com/epiphany-platform/epiphany/issues/2844) - Refactor K8s upgrade task in order to simplify its flow
+- [#2985](https://github.com/epiphany-platform/epiphany/issues/2985) - Make RabbitMQ Plugins configurable
 
 ### Fixed
 
@@ -23,6 +24,7 @@
 - [#2940](https://github.com/epiphany-platform/epiphany/issues/2940) - firewalld.service unit could not be found on host however ansible_facts sees it as defined
 - [#2979](https://github.com/epiphany-platform/epiphany/issues/2979) - Restore the possibility of choosing the availability zone in AWS
 - [#2984](https://github.com/epiphany-platform/epiphany/issues/2984) - Validation blocks overwriting of destination_address_prefix in NSG rules, which is 0.0.0.0/0 by default
+- [#2966](https://github.com/epiphany-platform/epiphany/issues/2966) - `epicli init --full` does not generate configuration for OpenDistro
 
 ### Updated
 

schema/any/defaults/configuration/minimal-cluster-config.yml

@@ -46,6 +46,10 @@ specification:
       count: 1
       machines:
         - default-rabbitmq
+    opendistro_for_elasticsearch:
+      count: 1
+      machines:
+        - default-opendistro
 ---
 kind: infrastructure/machine
 provider: any
@@ -123,3 +127,10 @@ name: default-rabbitmq
 specification:
   hostname: rabbitmq # YOUR-MACHINE-HOSTNAME
   ip: 192.168.100.111 # YOUR-MACHINE-IP
+---
+kind: infrastructure/machine
+provider: any
+name: default-opendistro
+specification:
+  hostname: opendistro # YOUR-MACHINE-HOSTNAME
+  ip: 192.168.100.112 # YOUR-MACHINE-IP

schema/aws/defaults/configuration/minimal-cluster-config.yml

@@ -34,3 +34,5 @@ specification:
       count: 1
     rabbitmq:
       count: 1
+    opendistro_for_elasticsearch:
+      count: 1

schema/azure/defaults/configuration/minimal-cluster-config.yml

@@ -32,3 +32,5 @@ specification:
       count: 1
     rabbitmq:
       count: 1
+    opendistro_for_elasticsearch:
+      count: 1

schema/common/defaults/configuration/applications.yml

@@ -24,7 +24,7 @@ specification:
       #amqp_port: 5672 #optional - default 5672
       plugins: # optional list of RabbitMQ plugins
         - rabbitmq_management
-        - rabbitmq_management_agent
+        - rabbitmq_peer_discovery_k8s
       policies: # optional list of RabbitMQ policies
         - name: ha-policy2
           pattern: ".*"