Merge pull request #37 from Temelio/explicit_deployment_key

Fix cli authentication problem

library/enable_jenkins_plugin.py

@@ -13,6 +13,10 @@ def main():
             name=dict(
                 type='str',
                 required=True),
+            deployment_ssh_key=dict(
+                type='str',
+                required=False,
+                default='/var/lib/jenkins/.ssh/id_rsa'),
             cli_path=dict(
                 type='str',
                 required=False,
@@ -32,8 +36,9 @@ def main():
                                basename(__file__))
 
     rc, stdout, stderr = module.run_command(
-        "java -jar %s -s '%s' groovy %s %s" %
-        (module.params['cli_path'], module.params['url'], script,
+        "java -jar %s -s '%s' -i '%s' groovy %s %s" %
+        (module.params['cli_path'], module.params['url'],
+         module.params['deployment_ssh_key'], script,
          module.params['name']))
 
     if (rc != 0):

library/get_jenkins_plugins.py

@@ -9,6 +9,10 @@ def main():
 
     module = AnsibleModule(
         argument_spec=dict(
+            deployment_ssh_key=dict(
+                type='str',
+                required=False,
+                default='/var/lib/jenkins/.ssh/id_rsa'),
             cli_path=dict(
                 type='str',
                 required=False,
@@ -26,12 +30,13 @@ def main():
 
     jenkins_cli_path = module.params['cli_path']
     jenkins_url = module.params['url']
+    deployment_ssh_key = module.params['deployment_ssh_key']
     script = "%s/%s.groovy" % (module.params['groovy_scripts_path'],
                                basename(__file__))
 
     rc, stdout, stderr = module.run_command(
-        "java -jar %s -s '%s' groovy %s" %
-        (jenkins_cli_path, jenkins_url, script))
+        "java -jar %s -s '%s' -i '%s' groovy %s" %
+        (jenkins_cli_path, jenkins_url, deployment_ssh_key, script))
 
     if (rc != 0):
         module.fail_json(msg=stderr)

library/get_plugin_dependencies.py

@@ -13,6 +13,10 @@ def main():
             name=dict(
                 type='str',
                 required=True),
+            deployment_ssh_key=dict(
+                type='str',
+                required=False,
+                default='/var/lib/jenkins/.ssh/id_rsa'),
             cli_path=dict(
                 type='str',
                 required=False,
@@ -32,8 +36,9 @@ def main():
                                basename(__file__))
 
     rc, stdout, stderr = module.run_command(
-        "java -jar %s -s '%s' groovy %s %s" %
-        (module.params['cli_path'], module.params['url'], script,
+        "java -jar %s -s '%s' -i '%s' groovy %s %s" %
+        (module.params['cli_path'], module.params['url'],
+         module.params['deployment_ssh_key'], script,
          module.params['name']))
 
     if (rc != 0):

library/install_jenkins_plugin.py

@@ -13,6 +13,10 @@ def main():
             name=dict(
                 type='str',
                 required=True),
+            deployment_ssh_key=dict(
+                type='str',
+                required=False,
+                default='/var/lib/jenkins/.ssh/id_rsa'),
             cli_path=dict(
                 type='str',
                 required=False,
@@ -37,8 +41,9 @@ def main():
                                basename(__file__))
 
     rc, stdout, stderr = module.run_command(
-        "java -jar %s -s '%s' groovy %s %s %s" %
-        (module.params['cli_path'], module.params['url'], script,
+        "java -jar %s -s '%s' -i '%s' groovy %s %s %s" %
+        (module.params['cli_path'], module.params['url'],
+         module.params['deployment_ssh_key'], script,
          module.params['name'], module.params['state']))
 
     if (rc != 0):

library/manage_jenkins_credentials.py

@@ -51,6 +51,10 @@ def main():
             text=dict(
                 type='str',
                 required=False),
+            deployment_ssh_key=dict(
+                type='str',
+                required=False,
+                default='/var/lib/jenkins/.ssh/id_rsa'),
             cli_path=dict(
                 type='str',
                 required=False,
@@ -70,8 +74,9 @@ def main():
                                basename(__file__))
 
     rc, stdout, stderr = module.run_command(
-        "java -jar %s -s '%s' groovy %s '%s'" %
-        (module.params['cli_path'], module.params['url'], script,
+        "java -jar %s -s '%s' -i '%s' groovy %s '%s'" %
+        (module.params['cli_path'], module.params['url'],
+         module.params['deployment_ssh_key'], script,
          json.dumps(module.params)))
 
     if (rc != 0):

library/manage_jenkins_location_settings.py

@@ -19,6 +19,10 @@ def main():
             jenkins_url=dict(
                 type='str',
                 required=True),
+            deployment_ssh_key=dict(
+                type='str',
+                required=False,
+                default='/var/lib/jenkins/.ssh/id_rsa'),
             cli_path=dict(
                 type='str',
                 required=False,
@@ -38,8 +42,9 @@ def main():
                                basename(__file__))
 
     rc, stdout, stderr = module.run_command(
-        "java -jar %s -s '%s' groovy %s '%s' '%s' '%s'" %
-        (module.params['cli_path'], module.params['url'], script,
+        "java -jar %s -s '%s' -i '%s' groovy %s '%s' '%s' '%s'" %
+        (module.params['cli_path'], module.params['url'],
+         module.params['deployment_ssh_key'], script,
          module.params['full_name'], module.params['email'],
          module.params['jenkins_url']))
 

library/manage_jenkins_main_configuration.py

@@ -31,7 +31,10 @@
     slave_agent_port=dict(
         type='int',
         required=True),
-
+    deployment_ssh_key=dict(
+        type='str',
+        required=False,
+        default='/var/lib/jenkins/.ssh/id_rsa'),
     cli_path=dict(
         type='str',
         required=False,
@@ -55,9 +58,10 @@ def main():
                                basename(__file__))
 
     rc, stdout, stderr = module.run_command(
-        "java -jar %s -s '%s' groovy %s '%s'" %
-        (module.params['cli_path'], module.params['url'], script,
-            json.dumps(module.params)))
+        "java -jar %s -s '%s' -i '%s' groovy %s '%s'" %
+        (module.params['cli_path'], module.params['url'],
+         module.params['deployment_ssh_key'], script,
+         json.dumps(module.params)))
 
     if (rc != 0):
         module.fail_json(msg=stderr)

library/manage_jenkins_plugin_debian_package_builder_gpg.py

@@ -25,6 +25,10 @@ def main():
             passphrase=dict(
                 type='str',
                 required=True),
+            deployment_ssh_key=dict(
+                type='str',
+                required=False,
+                default='/var/lib/jenkins/.ssh/id_rsa'),
             cli_path=dict(
                 type='str',
                 required=False,
@@ -44,8 +48,9 @@ def main():
                                basename(__file__))
 
     rc, stdout, stderr = module.run_command(
-        "java -jar %s -s '%s' groovy %s '%s'" %
-        (module.params['cli_path'], module.params['url'], script,
+        "java -jar %s -s '%s' -i '%s' groovy %s '%s'" %
+        (module.params['cli_path'], module.params['url'],
+         module.params['deployment_ssh_key'], script,
          json.dumps(module.params)))
 
     if (rc != 0):

library/manage_jenkins_plugin_debian_package_builder_repo.py

@@ -38,6 +38,10 @@ def main():
                 required=False,
                 default='present',
                 choice=['present', 'absent']),
+            deployment_ssh_key=dict(
+                type='str',
+                required=False,
+                default='/var/lib/jenkins/.ssh/id_rsa'),
             cli_path=dict(
                 type='str',
                 required=False,
@@ -57,8 +61,9 @@ def main():
                                basename(__file__))
 
     rc, stdout, stderr = module.run_command(
-        "java -jar %s -s '%s' groovy %s '%s'" %
-        (module.params['cli_path'], module.params['url'], script,
+        "java -jar %s -s '%s' -i '%s' groovy %s '%s'" %
+        (module.params['cli_path'], module.params['url'],
+         module.params['deployment_ssh_key'], script,
          json.dumps(module.params)))
 
     if (rc != 0):

library/manage_jenkins_plugin_docker_clouds.py

@@ -36,6 +36,10 @@ def main():
                 required=False,
                 default='present',
                 choice=['present', 'absent']),
+            deployment_ssh_key=dict(
+                type='str',
+                required=False,
+                default='/var/lib/jenkins/.ssh/id_rsa'),
             cli_path=dict(
                 type='str',
                 required=False,
@@ -55,8 +59,9 @@ def main():
                                basename(__file__))
 
     rc, stdout, stderr = module.run_command(
-        "java -jar %s -s '%s' groovy %s '%s'" %
-        (module.params['cli_path'], module.params['url'], script,
+        "java -jar %s -s '%s' -i '%s' groovy %s '%s'" %
+        (module.params['cli_path'], module.params['url'],
+         module.params['deployment_ssh_key'], script,
          json.dumps(module.params)))
 
     if (rc != 0):

library/manage_jenkins_plugin_git.py

@@ -19,6 +19,10 @@ def main():
             create_accounts=dict(
                 type='bool',
                 required=True),
+            deployment_ssh_key=dict(
+                type='str',
+                required=False,
+                default='/var/lib/jenkins/.ssh/id_rsa'),
             cli_path=dict(
                 type='str',
                 required=False,
@@ -38,8 +42,9 @@ def main():
                                basename(__file__))
 
     rc, stdout, stderr = module.run_command(
-        "java -jar %s -s '%s' groovy %s '%s' '%s' '%s'" %
-        (module.params['cli_path'], module.params['url'], script,
+        "java -jar %s -s '%s' -i '%s' groovy %s '%s' '%s' '%s'" %
+        (module.params['cli_path'], module.params['url'],
+         module.params['deployment_ssh_key'], script,
          module.params['full_name'], module.params['email'],
          module.params['create_accounts']))
 

library/manage_jenkins_plugin_github.py

@@ -25,6 +25,10 @@ def main():
                 type='int',
                 required=False,
                 default=20),
+            deployment_ssh_key=dict(
+                type='str',
+                required=False,
+                default='/var/lib/jenkins/.ssh/id_rsa'),
             cli_path=dict(
                 type='str',
                 required=False,
@@ -44,8 +48,9 @@ def main():
                                basename(__file__))
 
     rc, stdout, stderr = module.run_command(
-        "java -jar %s -s '%s' groovy %s '%s'" %
-        (module.params['cli_path'], module.params['url'], script,
+        "java -jar %s -s '%s' -i '%s' groovy %s '%s'" %
+        (module.params['cli_path'], module.params['url'],
+         module.params['deployment_ssh_key'], script,
          json.dumps(module.params)))
 
     if (rc != 0):

library/manage_jenkins_plugin_gitlab.py

@@ -20,6 +20,10 @@ def main():
                 type='bool',
                 required=False,
                 default=False),
+            deployment_ssh_key=dict(
+                type='str',
+                required=False,
+                default='/var/lib/jenkins/.ssh/id_rsa'),
             cli_path=dict(
                 type='str',
                 required=False,
@@ -39,8 +43,9 @@ def main():
                                basename(__file__))
 
     rc, stdout, stderr = module.run_command(
-        "java -jar %s -s '%s' groovy %s '%s'" %
-        (module.params['cli_path'], module.params['url'], script,
+        "java -jar %s -s '%s' -i '%s' groovy %s '%s'" %
+        (module.params['cli_path'], module.params['url'],
+         module.params['deployment_ssh_key'], script,
          json.dumps(module.params)))
 
     if (rc != 0):

library/manage_jenkins_plugin_hipchat.py

@@ -27,6 +27,10 @@ def main():
             send_as=dict(
                 type='str',
                 required=True),
+            deployment_ssh_key=dict(
+                type='str',
+                required=False,
+                default='/var/lib/jenkins/.ssh/id_rsa'),
             cli_path=dict(
                 type='str',
                 required=False,
@@ -46,8 +50,9 @@ def main():
                                basename(__file__))
 
     rc, stdout, stderr = module.run_command(
-        "java -jar %s -s '%s' groovy %s '%s'" %
-        (module.params['cli_path'], module.params['url'], script,
+        "java -jar %s -s '%s' -i '%s' groovy %s '%s'" %
+        (module.params['cli_path'], module.params['url'],
+         module.params['deployment_ssh_key'], script,
          json.dumps(module.params)))
 
     if (rc != 0):

library/manage_jenkins_plugin_hipchat_notifications.py

@@ -38,6 +38,10 @@ def main():
                 required=False,
                 choices=['present', 'absent'],
                 default='present'),
+            deployment_ssh_key=dict(
+                type='str',
+                required=False,
+                default='/var/lib/jenkins/.ssh/id_rsa'),
             cli_path=dict(
                 type='str',
                 required=False,
@@ -57,8 +61,9 @@ def main():
                                basename(__file__))
 
     rc, stdout, stderr = module.run_command(
-        "java -jar %s -s '%s' groovy %s '%s'" %
-        (module.params['cli_path'], module.params['url'], script,
+        "java -jar %s -s '%s' -i '%s' groovy %s '%s'" %
+        (module.params['cli_path'], module.params['url'],
+         module.params['deployment_ssh_key'], script,
          json.dumps(module.params)))
 
     if (rc != 0):

library/manage_jenkins_plugin_mailer.py

@@ -38,6 +38,10 @@ def main():
                 type='bool',
                 required=False,
                 default=False),
+            deployment_ssh_key=dict(
+                type='str',
+                required=False,
+                default='/var/lib/jenkins/.ssh/id_rsa'),
             cli_path=dict(
                 type='str',
                 required=False,
@@ -57,8 +61,9 @@ def main():
                                basename(__file__))
 
     rc, stdout, stderr = module.run_command(
-        "java -jar %s -s '%s' groovy %s '%s'" %
-        (module.params['cli_path'], module.params['url'], script,
+        "java -jar %s -s '%s' -i '%s' groovy %s '%s'" %
+        (module.params['cli_path'], module.params['url'],
+         module.params['deployment_ssh_key'], script,
          json.dumps(module.params)))
 
     if (rc != 0):