Doc and linters CI fixes

Change-Id: Ie30e9def28d85b03f5fbfa151840cd7b79c2b93f

ansible/install/rsyslog-aggregator.yml

@@ -7,9 +7,9 @@
 - hosts: elasticsearch
   remote_user: root
   vars:
-    - rsyslog_elasticsearch_server: "localhost"
-    - rsyslog_aggregator_server: "localhost"
-    - rsyslog_aggregator: true
+    rsyslog_elasticsearch_server: "localhost"
+    rsyslog_aggregator_server: "localhost"
+    rsyslog_aggregator: true
   roles:
     - rsyslog-install
     - rsyslog-templates

ansible/install/rsyslog-logging.yml

@@ -7,7 +7,7 @@
 - hosts: Undercloud
   remote_user: "{{ local_remote_user }}"
   vars:
-    - ansible_ssh_pipelining: yes
+    ansible_ssh_pipelining: yes
   roles:
     - rsyslog-install
     - rsyslog-templates
@@ -16,7 +16,7 @@
   remote_user: "{{ host_remote_user }}"
   serial: 10
   vars:
-    - ansible_ssh_pipelining: yes
+    ansible_ssh_pipelining: yes
   roles:
     - rsyslog-install
     - rsyslog-templates

rally/rally-plugins/manila/create-share-boot-vm-mount-share-write-delete-vm-share.py

@@ -108,12 +108,12 @@ class CreateNFSShareBootVMAndAccessShare(utils.ManilaScenario, vm_utils.VMScenar
 
         mount_opt = "-t nfs -o nfsvers=4.1,proto=tcp"
         test_data = "Test Data"
-        script = f"sudo cloud-init status -w;" \
-                 f"sudo ip add add {ip}/24 dev eth1;" \
-                 f"sudo ip link set eth1 up;" \
-                 f"sudo mount {mount_opt} {location[0]} /mnt || exit 1;" \
-                 f"df -h;" \
-                 f"sudo echo {test_data} | sudo tee /mnt/testfile || exit 2"
+        script = f"sudo cloud-init status -w && " \
+            f"sudo ip add add {ip}/24 dev eth1 && " \
+            f"sudo ip link set eth1 up && " \
+            f"sudo mount {mount_opt} {location[0]} /mnt || exit 1 && " \
+            f"df -h && " \
+            f"sudo echo {test_data} | sudo tee /mnt/testfile || exit 2"
 
         command = {
             "script_inline": script,

rally/rally-plugins/pbench-fio/pbench_fio.py

@@ -155,12 +155,12 @@ class PbenchFio(vm_utils.VMScenario, neutron_utils.NeutronScenario,
 
     def copy_pbench_results(self, jumphost_ip, pbench_result_dir):
         cmd = f"scp -r -i ../pbench_fio_jumphost_pkey root@{jumphost_ip}:" \
-              f"/var/lib/pbench-agent/* {pbench_result_dir}/"
+            f"/var/lib/pbench-agent/* {pbench_result_dir}/"
         os.system(cmd)
 
     def copy_pbench_logs(self, jumphost_ip, user, pbench_log_dir):
         cmd = f"scp -i ../pbench_fio_jumphost_pkey {user}@{jumphost_ip}:" \
-              f"~/*.log {pbench_log_dir}/"
+            f"~/*.log {pbench_log_dir}/"
         os.system(cmd)
 
     def render_template(self, env, template, runtime, io_depth, workload_size,
@@ -252,19 +252,19 @@ class PbenchFio(vm_utils.VMScenario, neutron_utils.NeutronScenario,
     @atomic.action_timer("pbench_fio.write_job")
     def write(self, jump_ssh_root, block_size, sample):
         cmd_str = f"export LANG=C.UTF-8 && " \
-                  f"source /etc/profile.d/pbench-agent.sh && " \
-                  f"pbench-fio -t write -b {block_size} --client-file /root/client_file " \
-                  f"--pre-iteration-script=/root/drop-cache.sh --job-file=/root/write.job " \
-                  f"--sample={sample}"
+            f"source /etc/profile.d/pbench-agent.sh && " \
+            f"pbench-fio -t write -b {block_size} --client-file /root/client_file " \
+            f"--pre-iteration-script=/root/drop-cache.sh --job-file=/root/write.job " \
+            f"--sample={sample}"
         return self.exec_command_over_ssh(cmd_str, jump_ssh_root)
 
     @atomic.action_timer("pbench_fio.read_job")
     def read(self, jump_ssh_root, block_size, sample):
         cmd_str = f"export LANG=C.UTF-8 && " \
-                  f"source /etc/profile.d/pbench-agent.sh && " \
-                  f"pbench-fio -t read -b {block_size} --client-file /root/client_file " \
-                  f"--pre-iteration-script=/root/drop-cache.sh --job-file=/root/read.job " \
-                  f"--sample={sample}"
+            f"source /etc/profile.d/pbench-agent.sh && " \
+            f"pbench-fio -t read -b {block_size} --client-file /root/client_file " \
+            f"--pre-iteration-script=/root/drop-cache.sh --job-file=/root/read.job " \
+            f"--sample={sample}"
         return self.exec_command_over_ssh(cmd_str, jump_ssh_root)
 
     def build_jumphost(self, image, flavor, tenant_network, public_net_name,
@@ -354,9 +354,9 @@ class PbenchFio(vm_utils.VMScenario, neutron_utils.NeutronScenario,
     def prepare_inventory(self, server_ips, pbench_key_url, pbench_config_url, pbench_repo_name):
         servers = "\n".join([str(i) for i in server_ips])
         inventory_str = f"[servers]\n{servers}\n\n" \
-                        f"[servers:vars]\npbench_key_url = {pbench_key_url}\n" \
-                        f"pbench_config_url = {pbench_config_url}\n" \
-                        f"pbench_repo_name = {pbench_repo_name}"
+            f"[servers:vars]\npbench_key_url = {pbench_key_url}\n" \
+            f"pbench_config_url = {pbench_config_url}\n" \
+            f"pbench_repo_name = {pbench_repo_name}"
 
         with open("../pbench_inventory.inv", 'w') as file:
             file.write(inventory_str)

setup.cfg

@@ -24,8 +24,8 @@ setup-hooks =
     pbr.hooks.setup_hook
 
 [build_sphinx]
-source-dir = doc/source
-build-dir = doc/build
+source_dir = doc/source
+build_dir = doc/build
 all_files = 1
 
 [upload_sphinx]