Move some variables

UCL-MIRSG · Dec 21, 2023 · a8d7ca1 · a8d7ca1
1 parent 8c5c55b
commit a8d7ca1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/tests/molecule/resources/monitoring/inventory/group_vars/monitoring_client.yml b/tests/molecule/resources/monitoring/inventory/group_vars/monitoring_client.yml
@@ -1,2 +1,11 @@
-monitoring_client_certificate_cache_directory: "{{ docker_client_certificate_cache_directory }}"
-monitoring_client_exporter_password: password
+# mirsg.infrastructure.monitoring_client
+monitoring_client_monitoring_server_ip: "{{ hostvars['mserv']['ansible_ip'] }}"
+monitoring_client_owner: root
+monitoring_client_group: root
+monitoring_client_cert_dir: /root/monitoring_certs
+monitoring_client_ssl_key_file: /root/monitoring_certs/key.pem
+monitoring_client_ssl_csr_file: /root/monitoring_certs/monitoring.csr
+monitoring_client_ssl_pk8_file: /root/monitoring_certs/monitoring.pk8
+monitoring_client_ssl_cert_file: /root/monitoring_certs/cert.pem
+monitoring_client_server_ca_cert_file: /root/monitoring_certs/ca.pem
+
diff --git a/tests/molecule/resources/monitoring/inventory/group_vars/monitoring_service.yml b/tests/molecule/resources/monitoring/inventory/group_vars/monitoring_service.yml
@@ -1,17 +1,8 @@
 # mirsg.infrastructure.monitoring_client
 monitoring_client_certificate_cache_directory: "{{ lookup('env', 'HOME') }}/ansible_persistent_files/monitoring_server_certificates"
-monitoring_client_monitoring_server_ip: "{{ hostvars['mserv']['ansible_ip'] }}"
-monitoring_client_owner: root
-monitoring_client_group: root
-monitoring_client_cert_dir: /root/monitoring_certs
-monitoring_client_ssl_key_file: /root/monitoring_certs/key.pem
-monitoring_client_ssl_csr_file: /root/monitoring_certs/monitoring.csr
-monitoring_client_ssl_pk8_file: /root/monitoring_certs/monitoring.pk8
-monitoring_client_ssl_cert_file: /root/monitoring_certs/cert.pem
-monitoring_client_server_ca_cert_file: /root/monitoring_certs/ca.pem
+monitoring_client_certificate_file: "{{ hostvars[inventory_hostname]['hostname'] }}.cert"
 monitoring_client_exporter_username: prometheus
 monitoring_client_exporter_password: prometheus
-monitoring_client_certificate_file: "{{ hostvars['mclient']['hostname'] }}.cert"
 
 # mirsg.infrastructure.monitoring_server
 monitoring_server_certificate_cache_directory: "{{ monitoring_client_certificate_cache_directory }}"