Commit 5845ee81 by John Jarvis

updating jenkins_admin to use keys in the var file

parent d8d906eb
...@@ -23,8 +23,8 @@ JENKINS_ADMIN_NAME: 'default_jenkins_name' ...@@ -23,8 +23,8 @@ JENKINS_ADMIN_NAME: 'default_jenkins_name'
# JENKINS_ADMIN_CONFIGURATION_REPO: !!null # JENKINS_ADMIN_CONFIGURATION_REPO: !!null
# JENKINS_ADMIN_CONFIGURATION_SECURE_REPO: !!null # JENKINS_ADMIN_CONFIGURATION_SECURE_REPO: !!null
# #
# # Local path to the key to use to checkout secure repos on jenkins and in abbey # # git key to use to checkout secure repos on jenkins and in abbey
# JENKINS_ADMIN_GIT_KEY_LOCAL_PATH: !!null # JENKINS_ADMIN_GIT_KEY: !!null
# #
# # EC2 Key to use when bringing up the abbey instance in ec2 (aws key-pair) # # EC2 Key to use when bringing up the abbey instance in ec2 (aws key-pair)
# JENKINS_ADMIN_EC2_KEY: !!null # JENKINS_ADMIN_EC2_KEY: !!null
......
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
- fail: "JENKINS_ADMIN_CONFIGURATION_SECURE_REPO is not defined." - fail: "JENKINS_ADMIN_CONFIGURATION_SECURE_REPO is not defined."
when: JENKINS_ADMIN_CONFIGURATION_SECURE_REPO is not defined when: JENKINS_ADMIN_CONFIGURATION_SECURE_REPO is not defined
- fail: "JENKINS_ADMIN_GIT_KEY_LOCAL_PATH is not defined." - fail: "JENKINS_ADMIN_GIT_KEY is not defined."
when: JENKINS_ADMIN_GIT_KEY_LOCAL_PATH is not defined when: JENKINS_ADMIN_GIT_KEY is not defined
- fail: "JENKINS_ADMIN_EC2_KEY is not defined." - fail: "JENKINS_ADMIN_EC2_KEY is not defined."
when: JENKINS_ADMIN_EC2_KEY is not defined when: JENKINS_ADMIN_EC2_KEY is not defined
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
- name: drop the secure credentials - name: drop the secure credentials
copy: > copy: >
src={{JENKINS_ADMIN_GIT_KEY_LOCAL_PATH}} content="{{ JENKINS_ADMIN_GIT_KEY }}"
dest={{jenkins_home}}/.ssh/id_rsa dest={{jenkins_home}}/.ssh/id_rsa
owner={{jenkins_user}} owner={{jenkins_user}}
group={{jenkins_group}} group={{jenkins_group}}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment