CORD-706: Resolve conflicts between jinja and Ansible vars
Change-Id: If3ff83c15e3bf0072ada3ef28968a6dfc6cd8041
diff --git a/xos/synchronizer/steps/sync_onosapp.yaml b/xos/synchronizer/steps/sync_onosapp.yaml
index ee8846c..a8d939a 100644
--- a/xos/synchronizer/steps/sync_onosapp.yaml
+++ b/xos/synchronizer/steps/sync_onosapp.yaml
@@ -15,14 +15,14 @@
{% endfor %}
{% endif %}
{% if rest_configs %}
- rest_configs:
+ var_rest_configs:
{% for rest_config in rest_configs %}
- endpoint: {{ rest_config.endpoint }}
body: "{{ '{{' }} lookup('file', '{{ files_dir }}/{{ rest_config.fn }}') {{ '}}' }}"
{% endfor %}
{% endif %}
{% if early_rest_configs %}
- early_rest_configs:
+ var_early_rest_configs:
{% for early_rest_config in early_rest_configs %}
- endpoint: {{ early_rest_config.endpoint }}
body: "{{ '{{' }} lookup('file', '{{ files_dir }}/{{ early_rest_config.fn }}') {{ '}}' }}"
@@ -96,7 +96,7 @@
method: POST
user: karaf
password: karaf
- with_items: "early_rest_configs"
+ with_items: "var_early_rest_configs"
# Don't know how to check for this condition, just wait
- name: Wait for ONOS to restart
@@ -168,5 +168,5 @@
method: POST
user: karaf
password: karaf
- with_items: "rest_configs"
+ with_items: "var_rest_configs"
{% endif %}
diff --git a/xos/synchronizer/steps/sync_onosapp_nocontainer.yaml b/xos/synchronizer/steps/sync_onosapp_nocontainer.yaml
index 2a87c31..c959b8c 100644
--- a/xos/synchronizer/steps/sync_onosapp_nocontainer.yaml
+++ b/xos/synchronizer/steps/sync_onosapp_nocontainer.yaml
@@ -12,7 +12,7 @@
{% endfor %}
{% endif %}
{% if rest_configs %}
- rest_configs:
+ var_rest_configs:
{% for rest_config in rest_configs %}
- endpoint: {{ rest_config.endpoint }}
body: "{{ '{{' }} lookup('file', '{{ files_dir }}/{{ rest_config.fn }}') {{ '}}' }}"
@@ -59,5 +59,5 @@
method: POST
user: karaf
password: karaf
- with_items: "{{ '{{' }} rest_configs {{ '}}' }}"
+ with_items: "{{ '{{' }} var_rest_configs {{ '}}' }}"
{% endif %}