Browse Source

docker_creds: Add tls_verify parameter

Scott Dodson 6 years ago
parent
commit
43fe74a4df
1 changed files with 7 additions and 3 deletions
  1. 7 3
      roles/lib_utils/library/docker_creds.py

+ 7 - 3
roles/lib_utils/library/docker_creds.py

@@ -131,14 +131,16 @@ def load_config_file(module, dest):
         return {}
 
 
-def gen_skopeo_cmd(registry, username, password, proxy_vars, image_name):
+# pylint: disable=too-many-arguments
+def gen_skopeo_cmd(registry, username, password, proxy_vars, image_name, tls_verify):
     '''Generate skopeo command to run'''
     skopeo_temp = ("{proxy_vars} timeout 10 skopeo inspect"
                    " {creds} docker://{registry}/{image_name}")
     # this will quote the entire creds argument to account for special chars.
     creds = pipes.quote('--creds={}:{}'.format(username, password))
     skopeo_args = {'proxy_vars': proxy_vars, 'creds': creds,
-                   'registry': registry, 'image_name': image_name}
+                   'registry': registry, 'image_name': image_name,
+                   'tls_verify': tls_verify}
     return skopeo_temp.format(**skopeo_args).strip()
 
 
@@ -199,6 +201,7 @@ def run_module():
         test_login=dict(type='bool', required=False, default=True),
         proxy_vars=dict(type='str', required=False, default=''),
         image_name=dict(type='str', required=True),
+        tls_verify=dict(type='bool', required=False, default=True)
     )
 
     module = AnsibleModule(
@@ -214,6 +217,7 @@ def run_module():
     test_login = module.params['test_login']
     proxy_vars = module.params['proxy_vars']
     image_name = module.params['image_name']
+    tls_verify = module.params['tls_verify']
 
     if not check_dest_dir_exists(module, dest):
         create_dest_dir(module, dest)
@@ -226,7 +230,7 @@ def run_module():
     # Test the credentials
     if test_login:
         skopeo_command = gen_skopeo_cmd(registry, username, password,
-                                        proxy_vars, image_name)
+                                        proxy_vars, image_name, tls_verify)
         validate_registry_login(module, skopeo_command)
 
     # base64 encode our username:password string