pleasing linter

Author: XaverStiensmeier

bibigrid/core/actions/create.py

@@ -432,10 +432,11 @@ def upload_data(self, private_key, clean_playbook=False):
         """
         self.log.debug("Running upload_data")
 
-        self.write_remote = self.write_remote + ansible_configurator.configure_ansible_yaml(providers=self.providers,
-                                                                                            configurations=self.configurations,
-                                                                                            cluster_id=self.cluster_id,
-                                                                                            log=self.log)
+        self.write_remote = (self.write_remote +
+                             ansible_configurator.configure_ansible_yaml(providers=self.providers,
+                                                                         configurations=self.configurations,
+                                                                         cluster_id=self.cluster_id,
+                                                                         log=self.log))
         self.write_remote.append((self.host_vars, a_rp.HOSTS_FILE_REMOTE))
         ansible_start = ssh_handler.ansible_start(",".join(self.permanents))
         self.log.debug(f"Starting playbook with {ansible_start}.")

bibigrid/core/utility/ansible_commands.py

@@ -2,9 +2,6 @@
 Module containing a bunch of useful commands to be used by sshHandler.py for cluster setup
 """
 
-import os
-import bibigrid.core.utility.paths.ansible_resources_path as a_rp
-
 # TO_LOG = "| sudo tee -a /var/log/ansible.log"
 # AIY = "apt-get -y install"
 # SAU = "sudo apt-get update"
@@ -56,9 +53,9 @@
     "Waiting for service {service}.")
 UPDATE = ("sudo apt-get update", "Update apt repository lists.")
 PYTHON3_PIP = ("sudo apt-get install -y python3-pip python3-venv", "Install python3 pip and venv using apt.")
-VENV_SETUP = ("sudo python3 -m venv /opt/bibigrid-venv"," Create bibigrid virtual environment.")
+VENV_SETUP = ("sudo python3 -m venv /opt/bibigrid-venv", " Create bibigrid virtual environment.")
 ANSIBLE_PASSLIB = ("sudo /opt/bibigrid-venv/bin/pip install ansible==10.7 passlib",
                    "Install Ansible 10.7 and Passlib using pip.")
-ANSIBLE_GALAXY = ("sudo /opt/bibigrid-venv/bin/ansible-galaxy collection install "+
+ANSIBLE_GALAXY = ("sudo /opt/bibigrid-venv/bin/ansible-galaxy collection install " +
                   "-p /usr/share/ansible/collections community.zabbix==3.2.0",
                   "Install necessary ansible-galaxy modules.")

bibigrid/core/utility/ansible_configurator.py

@@ -138,7 +138,7 @@ def get_vpn_var(*, provider, configuration, cluster_id, vpngtw, vpn_count):
     return vpngtw_dict, os.path.join(aRP.HOST_VARS_FOLDER_REMOTE, f"{name}.yaml")
 
 
-def get_master_var(provider, configuration, cluster_id, log):
+def get_master_var(provider, configuration, cluster_id):
     master = configuration["masterInstance"]
     name = MASTER_IDENTIFIER(cluster_id=cluster_id)
     flavor_dict = provider.create_flavor_dict(flavor=master["type"])
@@ -184,7 +184,7 @@ def get_host_and_group_vars(configurations, providers, cluster_id, log):
                 get_vpn_var(provider=provider, configuration=configuration, cluster_id=cluster_id, vpngtw=vpngtw,
                             vpn_count=vpn_count))
         else:
-            write_remote.append(get_master_var(provider, configuration, cluster_id, log))
+            write_remote.append(get_master_var(provider, configuration, cluster_id))
     return write_remote
 
 
@@ -408,7 +408,6 @@ def configure_ansible_yaml(providers, configurations, cluster_id, log):
     @return:
     """
     log.info("Writing ansible files...")
-    alias = configurations[0].get("aliasDumper", False)
     user_roles = configurations[0].get("userRoles", [])
     default_user = providers[0].cloud_specification["auth"].get("username", configurations[0].get("sshUser", "Ubuntu"))
     add_wireguard_peers(configurations)