[skywalking-terraform] branch main updated: fix: Ansible variable parsing and loop iteration (#15)

[kezhenxu94]

This is an automated email from the ASF dual-hosted git repository.

kezhenxu94 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-terraform.git


The following commit(s) were added to refs/heads/main by this push:
     new 9f14e68  fix: Ansible variable parsing and loop iteration (#15)
9f14e68 is described below

commit 9f14e6880aa5c5b690111bb4b52ed3a00b0e3638
Author: Rahul Bajaj <rahulrb0...@gmail.com>
AuthorDate: Wed Aug 2 02:08:44 2023 -0400

    fix: Ansible variable parsing and loop iteration (#15)
---
 ansible/roles/skywalking/tasks/main.yml | 2 +-
 ansible/roles/skywalking/vars/main.yml  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ansible/roles/skywalking/tasks/main.yml 
b/ansible/roles/skywalking/tasks/main.yml
index 062b69a..c00dba3 100644
--- a/ansible/roles/skywalking/tasks/main.yml
+++ b/ansible/roles/skywalking/tasks/main.yml
@@ -78,7 +78,7 @@
     path: "{{ env_file }}"
     line: "{{ item.key }}={{ item.value }}"
     create: yes
-  loop: "{{ sw_ui_env_vars|dict2items }}"
+  loop: "{{ sw_ui_env_vars | dict2items }}"
 
 - name: Reload systemd
   systemd:
diff --git a/ansible/roles/skywalking/vars/main.yml 
b/ansible/roles/skywalking/vars/main.yml
index 6dc21a1..4c45723 100644
--- a/ansible/roles/skywalking/vars/main.yml
+++ b/ansible/roles/skywalking/vars/main.yml
@@ -21,6 +21,6 @@ sw_zipkin_address: "9412"
 
 sw_ui_env_vars:
   SW_SERVER_PORT: "{{ sw_ui_server_port }}"
-  SW_OAP_ADDRESS: "{% for host in groups['skywalking_oap'] %}http://{{ 
hostvars[host].ansible_host }}:{{ sw_oap_server_port }}{% if not loop.last 
%},{% endif %}{% endfor %}"
-  SW_ZIPKIN_ADDRESS: "{% for host in groups['skywalking_oap'] %}http://{{ 
hostvars[host].ansible_host }}:{{ sw_zipkin_address }}{% if not loop.last %},{% 
endif %}{% endfor %}"
+  SW_OAP_ADDRESS: "{% for host in groups['skywalking_oap'] %}http://{{ 
hostvars[host].inventory_hostname }}:{{ sw_oap_server_port }}{% if not 
loop.last %},{% endif %}{% endfor %}"
+  SW_ZIPKIN_ADDRESS: "{% for host in groups['skywalking_oap'] %}http://{{ 
hostvars[host].inventory_hostname }}:{{ sw_zipkin_address }}{% if not loop.last 
%},{% endif %}{% endfor %}"
 env_file: /usr/local/skywalking/webapp/sw_ui_env_file