Apply review comments

datastax · Jul 8, 2024 · 7c8671a · 7c8671a
1 parent 74ca965
commit 7c8671a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/ansible/deploy_zdm_proxy.yml b/ansible/deploy_zdm_proxy.yml
@@ -223,9 +223,9 @@
         zdm_proxy_config_mode: "env_vars"
     - name: Verify proxy container configuration
       assert:
-        that: zdm_proxy_config_mode == "env_vars" or zdm_proxy_config_mode == "conf_file"
+        that: zdm_proxy_config_mode == "env_vars" or zdm_proxy_config_mode == "config_file"
         success_msg: "ZDM proxy container correctly configured"
-        fail_msg: "Invalid value of 'zdm_proxy_config_mode' parameter"
+        fail_msg: "Invalid value of 'zdm_proxy_config_mode' parameter, supported values are 'env_vars' or 'config_file'"
     - name: Create configuration fragment directory
       file:
         path: "{{ zdm_proxy_home_dir }}/{{ zdm_proxy_config_fragments_dir_name }}"
@@ -284,7 +284,7 @@
         ansible_python_interpreter: python3
 
     - name: Create ZDM proxy container with configuration file
-      when: "zdm_proxy_config_mode == 'conf_file'"
+      when: "zdm_proxy_config_mode == 'config_file'"
       docker_container:
         name: "{{ zdm_proxy_container_name }}"
         image: "docker.io/{{ zdm_proxy_image }}"

diff --git a/ansible/rolling_update_zdm_proxy.yml b/ansible/rolling_update_zdm_proxy.yml
@@ -31,9 +31,9 @@
         zdm_proxy_config_mode: "env_vars"
     - name: Verify proxy container configuration
       assert:
-        that: zdm_proxy_config_mode == "env_vars" or zdm_proxy_config_mode == "conf_file"
+        that: zdm_proxy_config_mode == "env_vars" or zdm_proxy_config_mode == "config_file"
         success_msg: "ZDM proxy container correctly configured"
-        fail_msg: "Invalid value of 'zdm_proxy_config_mode' parameter"
+        fail_msg: "Invalid value of 'zdm_proxy_config_mode' parameter, supported values are 'env_vars' or 'config_file'"
     - name: Generate configuration file from template for mutable configuration
       template:
         src: "{{ 'zdm_proxy_mutable_config_env_vars.j2' if zdm_proxy_config_mode == 'env_vars' else 'zdm_proxy_mutable_config_file.j2' }}"
@@ -78,7 +78,7 @@
         ansible_python_interpreter: python3
 
     - name: Create ZDM proxy container with updated configuration file
-      when: "zdm_proxy_config_mode == 'conf_file'"
+      when: "zdm_proxy_config_mode == 'config_file'"
       docker_container:
         name: "{{ zdm_proxy_container_name }}"
         image: "{{ zdm_proxy_image }}"

diff --git a/ansible/vars/zdm_proxy_container_config.yml b/ansible/vars/zdm_proxy_container_config.yml
@@ -5,5 +5,5 @@ create_containers: 1
 zdm_proxy_container_name: zdm-proxy-container
 
 # Defines how configuration shall be passed to ZDM proxy.
-# Allowed values are "env_vars" and "conf_file".
+# Allowed values are "env_vars" and "config_file".
 zdm_proxy_config_mode: env_vars