Use configparser to read configuration file

With previous solution, provided parameters like --debug or
--insecure requires additional boolean parameter, which normally
it should not be required.

Change-Id: I2ecedc9d9c3610b08a6d3b9a4e5a5727a3e6e3dd

ansible/roles/logscraper/tasks/service.yml

@@ -15,16 +15,21 @@
     mode: '0755'
   register: _start_script
 
-- name: Generate logscraper download file list
+- name: Generate logscraper config file
   template:
-    src: config.yaml.j2
-    dest: "{{ logscraper_dir }}/logscraper-{{ item.tenant }}.yaml"
+    src: config.j2
+    dest: "{{ logscraper_dir }}/logscraper-{{ item.tenant }}.config"
     owner: "{{ logscraper_user }}"
     group: "{{ logscraper_group }}"
     mode: '0644'
   register: _config_file
 
-- name: Copy logscraper config file
+- name: Delete old logscraper config file
+  file:
+    path: "{{ logscraper_dir }}/logscraper-{{ item.tenant }}.yaml"
+    state: absent
+
+- name: Generate logscraper download file list
   template:
     src: download-list.yaml.j2
     dest: "{{ logscraper_dir }}/download-list-{{ item.tenant }}.yaml"

ansible/roles/logscraper/templates/config.j2

@@ -1,4 +1,4 @@
----
+[DEFAULT]
 zuul_api_url: {{ item['zuul_api_url'].split(', ') }}
 follow: {{ item['follow'] | default(true) }}
 checkpoint_file: {{ item['checkpoint_file'] | default(logscraper_dir + '/checkpoint') }}

ansible/roles/logscraper/templates/logscraper.sh.j2

@@ -15,4 +15,4 @@
     --volume {{ item.download_dir }}:{{ item.download_dir }}:z \
     {% endif %}
     {{ container_images['logscraper'] }} \
-    /usr/local/bin/logscraper --config {{ logscraper_dir }}/logscraper-{{ item['tenant'] }}.yaml
+    /usr/local/bin/logscraper --config {{ logscraper_dir }}/logscraper-{{ item['tenant'] }}.config

ansible/roles/logsender/tasks/service.yml

@@ -8,11 +8,16 @@
 
 - name: Generate logsender configuration file
   template:
-    src: config.yaml.j2
-    dest: "{{ logscraper_dir }}/logsender-{{ item.tenant }}.yaml"
+    src: config.j2
+    dest: "{{ logscraper_dir }}/logsender-{{ item.tenant }}.config"
     mode: '0644'
   register: _config_file
 
+- name: Remove old logsender configuration file
+  file:
+    path: "{{ logscraper_dir }}/logsender-{{ item.tenant }}.yaml"
+    state: absent
+
 - name: Generate systemd unit
   template:
     src: logsender.service.j2

ansible/roles/logsender/templates/config.j2

@@ -1,4 +1,4 @@
----
+[DEFAULT]
 host: {{ item['es_host'] | default('localhost') }}
 port: {{ item['es_port'] | default(9200) }}
 username: {{ item['es_username'] | default('logstash') }}

ansible/roles/logsender/templates/logsender.sh.j2

@@ -13,4 +13,4 @@
     --volume {{ item['logsender_custom_ca_crt'] }}:{{ item['logsender_custom_ca_crt'] }}:z \
     {% endif %}
     {{ container_images['logsender'] }} \
-    /usr/local/bin/logsender --config {{ logscraper_dir }}/logsender-{{ item['tenant'] }}.yaml
+    /usr/local/bin/logsender --config {{ logscraper_dir }}/logsender-{{ item['tenant'] }}.config