molecule cleanup (reduce code dupl)

ansible-middleware · Oct 3, 2023 · 4f981e0 · 4f981e0
1 parent 300b0bc
commit 4f981e0
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 126 deletions.
diff --git a/molecule/all_auth/molecule.yml b/molecule/all_auth/molecule.yml
@@ -18,7 +18,7 @@ provisioner:
     ssh_connection:
       pipelining: false
   playbooks:
-    prepare: prepare.yml
+    prepare: ../prepare.yml
     converge: converge.yml
     verify: verify.yml
   inventory:

diff --git a/molecule/all_cluster/molecule.yml b/molecule/all_cluster/molecule.yml
@@ -18,7 +18,7 @@ provisioner:
     ssh_connection:
       pipelining: false
   playbooks:
-    prepare: prepare.yml
+    prepare: ../prepare.yml
     converge: converge.yml
     verify: verify.yml
   inventory:

diff --git a/molecule/all_cluster/prepare.yml b/molecule/all_cluster/prepare.yml
diff --git a/molecule/connect/molecule.yml b/molecule/connect/molecule.yml
@@ -18,7 +18,7 @@ provisioner:
     ssh_connection:
       pipelining: false
   playbooks:
-    prepare: prepare.yml
+    prepare: ../prepare.yml
     converge: converge.yml
     verify: verify.yml
   inventory:

diff --git a/molecule/connect/prepare.yml b/molecule/connect/prepare.yml
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -18,7 +18,7 @@ provisioner:
     ssh_connection:
       pipelining: false
   playbooks:
-    prepare: prepare.yml
+    prepare: ../prepare.yml
     converge: converge.yml
     verify: verify.yml
   inventory:

diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml
diff --git a/.../ssl_auth_sasl/generate_keys_and_certs.sh → molecule/generate_keys_and_certs.sh b/.../ssl_auth_sasl/generate_keys_and_certs.sh → molecule/generate_keys_and_certs.sh
diff --git a/molecule/all_auth/prepare.yml → molecule/prepare.yml b/molecule/all_auth/prepare.yml → molecule/prepare.yml
diff --git a/molecule/ssl_no_auth/prepare.yml → molecule/prepare_ssl.yml b/molecule/ssl_no_auth/prepare.yml → molecule/prepare_ssl.yml
diff --git a/molecule/ssl_auth_sasl/molecule.yml b/molecule/ssl_auth_sasl/molecule.yml
@@ -18,7 +18,7 @@ provisioner:
     ssh_connection:
       pipelining: false
   playbooks:
-    prepare: prepare.yml
+    prepare: ../prepare_ssl.yml
     converge: converge.yml
     verify: verify.yml
   inventory:

diff --git a/molecule/ssl_auth_sasl/prepare.yml b/molecule/ssl_auth_sasl/prepare.yml
diff --git a/molecule/ssl_no_auth/generate_keys_and_certs.sh b/molecule/ssl_no_auth/generate_keys_and_certs.sh
diff --git a/molecule/ssl_no_auth/molecule.yml b/molecule/ssl_no_auth/molecule.yml
@@ -18,7 +18,7 @@ provisioner:
     ssh_connection:
       pipelining: false
   playbooks:
-    prepare: prepare.yml
+    prepare: ../prepare.yml
     converge: converge.yml
     verify: verify.yml
   inventory:

diff --git a/roles/amq_streams_common/tasks/prometheus.yml b/roles/amq_streams_common/tasks/prometheus.yml
@@ -0,0 +1,26 @@
+---
+- name: "Ensure required parameters for Prometheus are provided."
+  ansible.builtin.assert:
+    that:
+      - amq_streams_common_prometheus_config_file is defined and amq_streams_common_prometheus_config_file | length > 0
+      - amq_streams_common_prometheus_config_file_template is defined and amq_streams_common_prometheus_config_file_template | length > 0
+    quiet: True
+
+- name: "Ensure directory {{ amq_streams_common_prometheus_metrics_config_home }} exits."
+  ansible.builtin.file:
+    path: "{{ amq_streams_common_prometheus_metrics_config_home }}"
+    state: directory
+
+- name: "Deploy Prometheus metrics file (src: {{ amq_streams_common_prometheus_config_file_template }} to dest: {{ amq_streams_common_prometheus_metrics_config_home }}{{ amq_streams_common_prometheus_config_file }}"
+  ansible.builtin.template:
+    src: "{{ amq_streams_common_prometheus_config_file_template }}"
+    dest: "{{ amq_streams_common_prometheus_metrics_config_home }}{{ amq_streams_common_prometheus_config_file }}"
+    owner: "{{ amq_streams_common_prometheus_user | default(omit) }}"
+    group: "{{ amq_streams_common_prometheus_group | default(omit) }}"
+    mode: 0644
+
+- name: "Add prometheus dependency (if enabled: {{ amq_streams_common_prometheus_enabled }})."
+  ansible.builtin.set_fact:
+    amq_streams_common_dependencies: "{{ [amq_streams_common_dependencies + ['{{ amq_streams_common_prometheus_package_name }}']] | flatten }}"
+  when:
+    - amq_streams_common_prometheus_install_rpm is defined and amq_streams_common_prometheus_install_rpm