From 122d3e0100cedf739e307089e3a9a013e457d899 Mon Sep 17 00:00:00 2001
From: xiaojueguan <xiaojueguan@gmail.com>
Date: Mon, 18 May 2020 15:17:16 +0800
Subject: [PATCH] Fix some error of j2 syntax
Change-Id: Ib0916626b969336ec4bb43028f95f901d5c8cb91
---
ansible/roles/collectd/defaults/main.yml | 2 +-
.../roles/neutron/templates/openvswitch_agent_xenapi.ini.j2 | 2 +-
ansible/roles/ovs-dpdk/defaults/main.yml | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ansible/roles/collectd/defaults/main.yml b/ansible/roles/collectd/defaults/main.yml
index 538dac80c..c1b133871 100644
--- a/ansible/roles/collectd/defaults/main.yml
+++ b/ansible/roles/collectd/defaults/main.yml
@@ -23,7 +23,7 @@ collectd_dimensions: "{{ default_container_dimensions }}"
collectd_default_volumes:
- "{{ node_config_directory }}/collectd/:{{ container_config_directory }}/:ro"
- - "{{node_config_directory }}/collectd/collectd.conf.d/:/etc/collectd/collectd.conf.d/"
+ - "{{ node_config_directory }}/collectd/collectd.conf.d/:/etc/collectd/collectd.conf.d/"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if kolla_base_distro in ['debian', 'ubuntu'] else '' }}"
- "kolla_logs:/var/log/kolla/"
diff --git a/ansible/roles/neutron/templates/openvswitch_agent_xenapi.ini.j2 b/ansible/roles/neutron/templates/openvswitch_agent_xenapi.ini.j2
index 9c19e3fe6..4e32acefc 100644
--- a/ansible/roles/neutron/templates/openvswitch_agent_xenapi.ini.j2
+++ b/ansible/roles/neutron/templates/openvswitch_agent_xenapi.ini.j2
@@ -17,7 +17,7 @@ bridge_mappings = {% for interface in neutron_external_interface.split(',') %}ph
bridge_mappings =
{% endif %}
-local_ip = {% for ip in os_xenapi_variables.dom0_ipv4s %}{% if ip.bridge == os_xenapi_variables.domu_vifs[tunnel_interface]['bridge'] %}{{ip.address}}{% endif %} {% endfor %}
+local_ip = {% for ip in os_xenapi_variables.dom0_ipv4s %}{% if ip.bridge == os_xenapi_variables.domu_vifs[tunnel_interface]['bridge'] %}{{ ip.address }}{% endif %} {% endfor %}
[xenapi]
connection_password = {{ xenserver_password }}
diff --git a/ansible/roles/ovs-dpdk/defaults/main.yml b/ansible/roles/ovs-dpdk/defaults/main.yml
index 46f0e80e9..8ee83478a 100644
--- a/ansible/roles/ovs-dpdk/defaults/main.yml
+++ b/ansible/roles/ovs-dpdk/defaults/main.yml
@@ -39,10 +39,10 @@ ovsdpdk_services:
####################
ovs_bridge_mappings: "{% for bridge in neutron_bridge_name.split(',') %}physnet{{ loop.index0 + 1 }}:{{ bridge }}{% if not loop.last %},{% endif %}{% endfor %}"
ovs_port_mappings: "{% for bridge in neutron_bridge_name.split(',') %} {{ neutron_external_interface.split(',')[loop.index0] }}:{{ bridge }}{% if not loop.last %},{% endif %}{% endfor %}"
-dpdk_tunnel_interface: "{{neutron_external_interface}}"
+dpdk_tunnel_interface: "{{ neutron_external_interface }}"
dpdk_tunnel_interface_address: "{{ 'dpdk_tunnel' | kolla_address }}"
-tunnel_interface_network: "{{ hostvars[inventory_hostname]['ansible_' + dpdk_tunnel_interface]['ipv4']['network']}}/{{hostvars[inventory_hostname]['ansible_' + dpdk_tunnel_interface]['ipv4']['netmask']}}"
-tunnel_interface_cidr: "{{dpdk_tunnel_interface_address}}/{{ tunnel_interface_network | ipaddr('prefix') }}"
+tunnel_interface_network: "{{ hostvars[inventory_hostname]['ansible_' + dpdk_tunnel_interface]['ipv4']['network']}}/{{hostvars[inventory_hostname]['ansible_' + dpdk_tunnel_interface]['ipv4']['netmask'] }}"
+tunnel_interface_cidr: "{{ dpdk_tunnel_interface_address }}/{{ tunnel_interface_network | ipaddr('prefix') }}"
ovs_cidr_mappings: "{% if neutron_bridge_name.split(',')|length != 1 %} {neutron_bridge_name.split(',')[0]}:{{ tunnel_interface_cidr }} {% else %} {{ neutron_bridge_name }}:{{ tunnel_interface_cidr }} {% endif %}"
ovs_mem_channels: 4
ovs_socket_mem: 1024
--
GitLab