Skip to content

Commit 7c8671a

Browse files
Apply review comments
1 parent 74ca965 commit 7c8671a

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

ansible/deploy_zdm_proxy.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,9 @@
223223
zdm_proxy_config_mode: "env_vars"
224224
- name: Verify proxy container configuration
225225
assert:
226-
that: zdm_proxy_config_mode == "env_vars" or zdm_proxy_config_mode == "conf_file"
226+
that: zdm_proxy_config_mode == "env_vars" or zdm_proxy_config_mode == "config_file"
227227
success_msg: "ZDM proxy container correctly configured"
228-
fail_msg: "Invalid value of 'zdm_proxy_config_mode' parameter"
228+
fail_msg: "Invalid value of 'zdm_proxy_config_mode' parameter, supported values are 'env_vars' or 'config_file'"
229229
- name: Create configuration fragment directory
230230
file:
231231
path: "{{ zdm_proxy_home_dir }}/{{ zdm_proxy_config_fragments_dir_name }}"
@@ -284,7 +284,7 @@
284284
ansible_python_interpreter: python3
285285

286286
- name: Create ZDM proxy container with configuration file
287-
when: "zdm_proxy_config_mode == 'conf_file'"
287+
when: "zdm_proxy_config_mode == 'config_file'"
288288
docker_container:
289289
name: "{{ zdm_proxy_container_name }}"
290290
image: "docker.io/{{ zdm_proxy_image }}"

ansible/rolling_update_zdm_proxy.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
zdm_proxy_config_mode: "env_vars"
3232
- name: Verify proxy container configuration
3333
assert:
34-
that: zdm_proxy_config_mode == "env_vars" or zdm_proxy_config_mode == "conf_file"
34+
that: zdm_proxy_config_mode == "env_vars" or zdm_proxy_config_mode == "config_file"
3535
success_msg: "ZDM proxy container correctly configured"
36-
fail_msg: "Invalid value of 'zdm_proxy_config_mode' parameter"
36+
fail_msg: "Invalid value of 'zdm_proxy_config_mode' parameter, supported values are 'env_vars' or 'config_file'"
3737
- name: Generate configuration file from template for mutable configuration
3838
template:
3939
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 @@
7878
ansible_python_interpreter: python3
7979

8080
- name: Create ZDM proxy container with updated configuration file
81-
when: "zdm_proxy_config_mode == 'conf_file'"
81+
when: "zdm_proxy_config_mode == 'config_file'"
8282
docker_container:
8383
name: "{{ zdm_proxy_container_name }}"
8484
image: "{{ zdm_proxy_image }}"

ansible/vars/zdm_proxy_container_config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ create_containers: 1
55
zdm_proxy_container_name: zdm-proxy-container
66

77
# Defines how configuration shall be passed to ZDM proxy.
8-
# Allowed values are "env_vars" and "conf_file".
8+
# Allowed values are "env_vars" and "config_file".
99
zdm_proxy_config_mode: env_vars

0 commit comments

Comments
 (0)