Merge "Ansible lint: whitespace"

ansible/roles/ceph/tasks/distribute_keyrings.yml

@@ -17,8 +17,8 @@
   bslurp:
     src: "{{ item.content }}"
     dest: "{{ node_config_directory }}/ceph-osd/{{ item.filename }}"
-    sha1: "{{ item.sha1 | default('')}}"
-    sha256: "{{ item.sha256 | default('')}}"
+    sha1: "{{ item.sha1 | default('') }}"
+    sha256: "{{ item.sha256 | default('') }}"
     mode: 0600
   with_items:
     - "{{ ceph_files['ceph.client.admin.keyring'] }}"
@@ -29,8 +29,8 @@
   bslurp:
     src: "{{ item.content }}"
     dest: "{{ node_config_directory }}/ceph-mon/{{ item.filename }}"
-    sha1: "{{ item.sha1 | default('')}}"
-    sha256: "{{ item.sha256 | default('')}}"
+    sha1: "{{ item.sha1 | default('') }}"
+    sha256: "{{ item.sha256 | default('') }}"
     mode: 0600
   with_items:
     - "{{ ceph_files['ceph.client.admin.keyring'] }}"
@@ -44,7 +44,7 @@
   bslurp:
     src: "{{ item.content }}"
     dest: "{{ node_config_directory }}/ceph-mgr/{{ item.filename }}"
-    sha1: "{{ item.sha1 | default('')}}"
+    sha1: "{{ item.sha1 | default('') }}"
     sha256: "{{ item.sha256 | default('') }}"
     mode: 0600
   with_items:
@@ -56,8 +56,8 @@
   bslurp:
     src: "{{ item.content }}"
     dest: "{{ node_config_directory }}/ceph-rgw/{{ item.filename }}"
-    sha1: "{{ item.sha1 | default('')}}"
-    sha256: "{{ item.sha256 | default('')}}"
+    sha1: "{{ item.sha1 | default('') }}"
+    sha256: "{{ item.sha256 | default('') }}"
     mode: 0600
   with_items:
     - "{{ ceph_files['ceph.client.admin.keyring'] }}"
@@ -69,8 +69,8 @@
   bslurp:
     src: "{{ item.content }}"
     dest: "{{ node_config_directory }}/ceph-nfs/{{ item.filename }}"
-    sha1: "{{ item.sha1 | default('')}}"
-    sha256: "{{ item.sha256 | default('')}}"
+    sha1: "{{ item.sha1 | default('') }}"
+    sha256: "{{ item.sha256 | default('') }}"
     mode: 0600
   with_items:
     - "{{ ceph_files['ceph.client.admin.keyring'] }}"

ansible/roles/elasticsearch/tasks/upgrade.yml

@@ -7,7 +7,7 @@
     method: PUT
     status_code: 200
     return_content: yes
-    body: {"transient":{"cluster.routing.allocation.enable": "none"}}
+    body: {"transient": {"cluster.routing.allocation.enable": "none"}}
     body_format: json
   delegate_to: "{{ groups['elasticsearch'][0] }}"
   run_once: true

ansible/roles/influxdb/tasks/config.yml

@@ -27,7 +27,7 @@
 
 - name: Copying over influxdb config file
   vars:
-    service: "{{ influxdb_services['influxdb']}}"
+    service: "{{ influxdb_services['influxdb'] }}"
   template:
     src: "{{ item }}"
     dest: "{{ node_config_directory }}/influxdb/influxdb.conf"

ansible/roles/kuryr/tasks/config.yml

@@ -66,7 +66,7 @@
 
 - name: Copying over kuryr.spec
   vars:
-    service: "{{ kuryr_services['kuryr']}}"
+    service: "{{ kuryr_services['kuryr'] }}"
   template:
     src: "kuryr.spec.j2"
     dest: "{{ node_config_directory }}/{{ item }}/kuryr.spec"

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

@@ -83,7 +83,7 @@
       enabled: true
     - uuid: "{{ cinder_rbd_secret_uuid }}"
       name: client.cinder secret
-      enabled: "{{ enable_cinder | bool and cinder_backend_ceph | bool}}"
+      enabled: "{{ enable_cinder | bool and cinder_backend_ceph | bool }}"
   notify:
     - Restart nova-libvirt container
 
@@ -102,7 +102,7 @@
       enabled: true
     - uuid: "{{ cinder_rbd_secret_uuid }}"
       content: "{{ cinder_cephx_raw_key.stdout|default('') }}"
-      enabled: "{{ enable_cinder | bool and cinder_backend_ceph | bool}}"
+      enabled: "{{ enable_cinder | bool and cinder_backend_ceph | bool }}"
   notify:
     - Restart nova-libvirt container
 

ansible/roles/panko/tasks/config.yml

@@ -64,7 +64,7 @@
 
 - name: Copying over wsgi-panko files for services
   vars:
-    service: "{{ panko_services['panko-api']}}"
+    service: "{{ panko_services['panko-api'] }}"
   template:
     src: "wsgi-panko.conf.j2"
     dest: "{{ node_config_directory }}/{{ item }}/wsgi-panko.conf"

ansible/roles/prometheus/tasks/config.yml

@@ -39,7 +39,7 @@
 - name: Copying over custom prometheus alert rules files
   become: true
   vars:
-    service: "{{ prometheus_services['prometheus-server']}}"
+    service: "{{ prometheus_services['prometheus-server'] }}"
   copy:
     src: "{{ item.path }}"
     dest: "{{ node_config_directory }}/prometheus-server/{{ item.path | basename }}"
@@ -55,7 +55,7 @@
 - name: Copying over prometheus config file
   become: true
   vars:
-    service: "{{ prometheus_services['prometheus-server']}}"
+    service: "{{ prometheus_services['prometheus-server'] }}"
   template:
     src: "{{ item }}"
     dest: "{{ node_config_directory }}/prometheus-server/prometheus.yml"
@@ -73,7 +73,7 @@
 - name: Copying over prometheus alertmanager config file
   become: true
   vars:
-    service: "{{ prometheus_services['prometheus-alertmanager']}}"
+    service: "{{ prometheus_services['prometheus-alertmanager'] }}"
   template:
     src: "{{ item }}"
     dest: "{{ node_config_directory }}/prometheus-alertmanager/prometheus-alertmanager.yml"
@@ -91,7 +91,7 @@
 - name: Copying over my.cnf for mysqld_exporter
   become: true
   vars:
-    service: "{{ prometheus_services['prometheus-mysqld-exporter']}}"
+    service: "{{ prometheus_services['prometheus-mysqld-exporter'] }}"
   merge_configs:
     sources:
       - "{{ node_custom_config }}/prometheus-mysqld-exporter/{{ inventory_hostname }}/my.cnf"