Unify jinja syntax

Change-Id: I63197f8c5646e44a9a7287e644c904a1e227af23

ansible/roles/ceilometer/tasks/bootstrap.yml

@@ -1,6 +1,6 @@
 ---
 - name: Creating Ceilometer MongoDB database
-  command: docker exec -t mongodb mongo --host {{ ceilometer_database_mongodb_address }} --eval 'db = db.getSiblingDB("{{ ceilometer_database_name }}"); db.createUser({user':' "{{ ceilometer_database_user }}", pwd':' "{{ ceilometer_database_password}}", roles':' [ "readWrite", "dbAdmin" ]})'
+  command: docker exec -t mongodb mongo --host {{ ceilometer_database_mongodb_address }} --eval 'db = db.getSiblingDB("{{ ceilometer_database_name }}"); db.createUser({user':' "{{ ceilometer_database_user }}", pwd':' "{{ ceilometer_database_password }}", roles':' [ "readWrite", "dbAdmin" ]})'
   register: mongodb_ceilometer_database
   run_once: true
   failed_when:

ansible/roles/ceph/tasks/reconfigure.yml

@@ -80,7 +80,7 @@
     - enable_ceph_rgw | bool
     - inventory_hostname in groups[item.group]
   with_items:
-    - { name: ceph_rgw, group: ceph-rgw}
+    - { name: ceph_rgw, group: ceph-rgw }
 
 - name: Containers config strategy for ceph_mon container
   kolla_docker:

ansible/roles/cinder/tasks/start.yml

@@ -42,7 +42,7 @@
     image: "{{ cinder_volume_image_full }}"
     privileged: True
     ipc_mode: "host"
-    volumes: '{{ cinder_volume_mounts | reject("equalto", "") | list}}'
+    volumes: '{{ cinder_volume_mounts | reject("equalto", "") | list }}'
   when: inventory_hostname in groups['cinder-volume']
 
 - name: Prepare volumes list for cinder-backup
@@ -63,5 +63,5 @@
     name: "cinder_backup"
     image: "{{ cinder_backup_image_full }}"
     privileged: True
-    volumes: '{{ cinder_backup_mounts | reject("equalto", "") | list}}'
+    volumes: '{{ cinder_backup_mounts | reject("equalto", "") | list }}'
   when: inventory_hostname in groups['cinder-backup']

ansible/roles/cloudkitty/templates/cloudkitty.conf.j2

@@ -6,7 +6,7 @@ log_dir = /var/log/kolla/cloudkitty
 transport_url = rabbit://{% for host in groups['rabbitmq'] %}{{ rabbitmq_user }}:{{ rabbitmq_password }}@{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %}
 
 [database]
-connection = mysql+pymysql://{{ cloudkitty_database_user }}:{{ cloudkitty_database_password }}@{{ cloudkitty_database_address}}/{{ cloudkitty_database_name }}
+connection = mysql+pymysql://{{ cloudkitty_database_user }}:{{ cloudkitty_database_password }}@{{ cloudkitty_database_address }}/{{ cloudkitty_database_name }}
 max_retries = -1
 
 [keystone_authtoken]

ansible/roles/congress/tasks/bootstrap_service.yml

@@ -2,7 +2,7 @@
 - name: Running congress bootstrap container
   kolla_docker:
     action: "start_container"
-    common_options: "{{docker_common_options}}"
+    common_options: "{{ docker_common_options }}"
     detach: False
     environment:
       KOLLA_BOOTSTRAP:

ansible/roles/congress/tasks/start.yml

@@ -3,7 +3,7 @@
   kolla_docker:
     action: "start_container"
     name: "congress_policy_engine"
-    common_options: "{{docker_common_options}}"
+    common_options: "{{ docker_common_options }}"
     image: "{{ congress_policy_engine_image_full }}"
     volumes:
       - "{{ node_config_directory }}/congress-policy-engine/:{{ container_config_directory }}/:ro"
@@ -15,7 +15,7 @@
   kolla_docker:
     action: "start_container"
     name: "congress_datasource"
-    common_options: "{{docker_common_options}}"
+    common_options: "{{ docker_common_options }}"
     image: "{{ congress_datasource_image_full }}"
     volumes:
       - "{{ node_config_directory }}/congress-datasource/:{{ container_config_directory }}/:ro"
@@ -27,7 +27,7 @@
   kolla_docker:
     action: "start_container"
     name: "congress_api"
-    common_options: "{{docker_common_options}}"
+    common_options: "{{ docker_common_options }}"
     image: "{{ congress_api_image_full }}"
     volumes:
       - "{{ node_config_directory }}/congress-api/:{{ container_config_directory }}/:ro"

ansible/roles/magnum/templates/magnum.conf.j2

@@ -15,7 +15,7 @@ host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['addr
 policy_file = /etc/magnum/policy.json
 
 [database]
-connection = mysql+pymysql://{{ magnum_database_user }}:{{ magnum_database_password }}@{{ magnum_database_address}}/{{ magnum_database_name }}
+connection = mysql+pymysql://{{ magnum_database_user }}:{{ magnum_database_password }}@{{ magnum_database_address }}/{{ magnum_database_name }}
 max_retries = -1
 
 [heat_client]

ansible/roles/mistral/tasks/bootstrap_service.yml

@@ -2,7 +2,7 @@
 - name: Running Mistral bootstrap container
   kolla_docker:
     action: "start_container"
-    common_options: "{{docker_common_options}}"
+    common_options: "{{ docker_common_options }}"
     detach: False
     environment:
       KOLLA_BOOTSTRAP:

ansible/roles/mistral/tasks/start.yml

@@ -3,7 +3,7 @@
   kolla_docker:
     action: "start_container"
     name: "mistral_engine"
-    common_options: "{{docker_common_options}}"
+    common_options: "{{ docker_common_options }}"
     image: "{{ mistral_engine_image_full }}"
     volumes:
       - "{{ node_config_directory }}/mistral-engine/:{{ container_config_directory }}/:ro"
@@ -15,7 +15,7 @@
   kolla_docker:
     action: "start_container"
     name: "mistral_executor"
-    common_options: "{{docker_common_options}}"
+    common_options: "{{ docker_common_options }}"
     image: "{{ mistral_executor_image_full }}"
     volumes:
       - "{{ node_config_directory }}/mistral-executor/:{{ container_config_directory }}/:ro"
@@ -27,7 +27,7 @@
   kolla_docker:
     action: "start_container"
     name: "mistral_api"
-    common_options: "{{docker_common_options}}"
+    common_options: "{{ docker_common_options }}"
     image: "{{ mistral_api_image_full }}"
     volumes:
       - "{{ node_config_directory }}/mistral-api/:{{ container_config_directory }}/:ro"

ansible/roles/nova/tasks/external-ceph.yml

@@ -15,7 +15,7 @@
 - name: Copy over ceph keyring file
   copy:
     src: "{{ cephx_keyring_files.files[0].path }}"
-    dest: "{{ node_config_directory }}/{{item}}/"
+    dest: "{{ node_config_directory }}/{{ item }}/"
   with_items:
     - nova-compute
     - nova-libvirt

ansible/roles/nova/templates/nova.conf.j2

@@ -161,7 +161,7 @@ password = {{ nova_keystone_password }}
 
 memcache_security_strategy = ENCRYPT
 memcache_secret_key = {{ memcache_secret_key }}
-memcached_servers = {% for host in groups['memcached'] %}{% if orchestration_engine == 'KUBERNETES' %}memcached{% else %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}{% endif%}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}
+memcached_servers = {% for host in groups['memcached'] %}{% if orchestration_engine == 'KUBERNETES' %}memcached{% else %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}{% endif %}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}
 
 
 [libvirt]

ansible/roles/panko/tasks/bootstrap.yml

@@ -1,6 +1,6 @@
 ---
 - name: Creating Panko MongoDB database
-  command: docker exec -t mongodb mongo --host {{ panko_database_mongodb_address }} --eval 'db = db.getSiblingDB("{{ panko_database_name }}"); db.createUser({user':' "{{ panko_database_user }}", pwd':' "{{ panko_database_password}}", roles':' [ "readWrite", "dbAdmin" ]})'
+  command: docker exec -t mongodb mongo --host {{ panko_database_mongodb_address }} --eval 'db = db.getSiblingDB("{{ panko_database_name }}"); db.createUser({user':' "{{ panko_database_user }}", pwd':' "{{ panko_database_password }}", roles':' [ "readWrite", "dbAdmin" ]})'
   register: mongodb_panko_database
   run_once: true
   failed_when:

ansible/roles/swift/templates/swift-rsyncd.json.j2

@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/rsync --daemon --no-detach --port={{swift_rsync_port}} --config=/etc/rsyncd.conf",
+    "command": "/usr/bin/rsync --daemon --no-detach --port={{ swift_rsync_port }} --config=/etc/rsyncd.conf",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/rsyncd.conf",

ansible/roles/trove/templates/trove-taskmanager.conf.j2

@@ -22,5 +22,5 @@ swift_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ swift_api_por
 {% endif %}
 
 [database]
-connection = mysql+pymysql://{{ trove_database_user }}:{{ trove_database_password }}@{{ trove_database_address}}/{{ trove_database_name }}
+connection = mysql+pymysql://{{ trove_database_user }}:{{ trove_database_password }}@{{ trove_database_address }}/{{ trove_database_name }}
 max_retries = -1

ansible/roles/watcher/templates/watcher.conf.j2

@@ -12,7 +12,7 @@ port = {{ watcher_api_port }}
 {% endif %}
 
 [database]
-connection = mysql+pymysql://{{ watcher_database_user }}:{{ watcher_database_password }}@{{ watcher_database_address}}/{{ watcher_database_name }}
+connection = mysql+pymysql://{{ watcher_database_user }}:{{ watcher_database_password }}@{{ watcher_database_address }}/{{ watcher_database_name }}
 max_retries = -1
 
 [keystone_authtoken]