@@ -56,7 +56,7 @@ def generate_site_file_yaml(user_roles):
5656 return site_yaml
5757
5858
59- def get_worker_host_vars (* , cluster_id , worker , worker_count , log ):
59+ def get_worker_host_vars (* , cluster_id , worker , worker_count ):
6060 write_host_vars_remote = []
6161 for worker_number in range (worker .get ('count' , 1 )):
6262 name = WORKER_IDENTIFIER (cluster_id = cluster_id , additional = worker_count + worker_number )
@@ -79,7 +79,8 @@ def get_worker_host_vars(*, cluster_id, worker, worker_count, log):
7979 return write_host_vars_remote
8080
8181
82- def get_worker_vars (* , provider , configuration , cluster_id , worker , worker_count , log ):
82+ def get_worker_vars (* , provider , configuration , cluster_id , worker ,
83+ worker_count ): # pylint: disable-msg=too-many-locals
8384 write_worker_vars_remote = []
8485 flavor_dict = provider .create_flavor_dict (flavor = worker ["type" ])
8586 name = WORKER_IDENTIFIER (cluster_id = cluster_id ,
@@ -113,13 +114,12 @@ def get_worker_vars(*, provider, configuration, cluster_id, worker, worker_count
113114 write_worker_vars_remote .append ((worker_dict , os .path .join (aRP .GROUP_VARS_FOLDER_REMOTE , f"{ group_name } .yaml" )))
114115 if worker_dict ["on_demand" ]: # not on demand instances host_vars are created in create
115116 write_worker_vars_remote = write_worker_vars_remote + get_worker_host_vars (cluster_id = cluster_id , worker = worker ,
116- worker_count = worker_count ,
117- log = log )
117+ worker_count = worker_count )
118118 worker_count += worker .get ('count' , 1 )
119119 return worker_count , write_worker_vars_remote
120120
121121
122- def get_vpn_var (* , provider , configuration , cluster_id , vpngtw , vpn_count , log ):
122+ def get_vpn_var (* , provider , configuration , cluster_id , vpngtw , vpn_count ):
123123 name = VPNGTW_IDENTIFIER (cluster_id = cluster_id , additional = f"{ vpn_count } " )
124124 wireguard_ip = f"10.0.0.{ vpn_count + 2 } " # skipping 0 and 1 (master)
125125 vpn_count += 1
@@ -176,13 +176,13 @@ def get_host_and_group_vars(configurations, providers, cluster_id, log):
176176 for worker in configuration .get ("workerInstances" , []):
177177 worker_count , write_worker_vars_remote = get_worker_vars (provider = provider , configuration = configuration ,
178178 cluster_id = cluster_id ,
179- worker = worker , worker_count = worker_count , log = log )
179+ worker = worker , worker_count = worker_count )
180180 write_remote = write_remote + write_worker_vars_remote
181181 vpngtw = configuration .get ("vpnInstance" )
182182 if vpngtw :
183183 write_remote .append (
184184 get_vpn_var (provider = provider , configuration = configuration , cluster_id = cluster_id , vpngtw = vpngtw ,
185- vpn_count = vpn_count , log = log ))
185+ vpn_count = vpn_count ))
186186 else :
187187 write_remote .append (get_master_var (provider , configuration , cluster_id , log ))
188188 return write_remote
0 commit comments