Commit fa7c26f1 by Stuart Young

add ssh key to other packer scripts

parent 0389a4cd
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
"ami": "{{env `JENKINS_WORKER_AMI`}}", "ami": "{{env `JENKINS_WORKER_AMI`}}",
"security_group": "{{env `AWS_SECURITY_GROUP`}}", "security_group": "{{env `AWS_SECURITY_GROUP`}}",
"delete_or_keep": "{{env `DELETE_OR_KEEP_AMI`}}", "delete_or_keep": "{{env `DELETE_OR_KEEP_AMI`}}",
"remote_branch": "{{env `REMOTE_BRANCH`}}" "remote_branch": "{{env `REMOTE_BRANCH`}}",
"jenkins_worker_key_url": "{{env `JENKINS_WORKER_KEY_URL`}}"
}, },
"builders": [{ "builders": [{
"type": "amazon-ebs", "type": "amazon-ebs",
...@@ -49,6 +50,9 @@ ...@@ -49,6 +50,9 @@
"playbook_dir": "../../playbooks", "playbook_dir": "../../playbooks",
"command": ". {{user `venv_dir`}}/bin/activate && ansible-playbook", "command": ". {{user `venv_dir`}}/bin/activate && ansible-playbook",
"inventory_groups": "jenkins_worker", "inventory_groups": "jenkins_worker",
"extra_arguments": [ "-vvv" ] "extra_arguments": [
"-e \"jenkins_worker_key_url='{{user `jenkins_worker_key_url`}}'\"",
"-vvv"
]
}] }]
} }
...@@ -8,7 +8,8 @@ ...@@ -8,7 +8,8 @@
"ami": "{{env `JENKINS_WORKER_AMI`}}", "ami": "{{env `JENKINS_WORKER_AMI`}}",
"security_group": "{{env `AWS_SECURITY_GROUP`}}", "security_group": "{{env `AWS_SECURITY_GROUP`}}",
"delete_or_keep": "{{env `DELETE_OR_KEEP_AMI`}}", "delete_or_keep": "{{env `DELETE_OR_KEEP_AMI`}}",
"remote_branch": "{{env `REMOTE_BRANCH`}}" "remote_branch": "{{env `REMOTE_BRANCH`}}",
"jenkins_worker_key_url": "{{env `JENKINS_WORKER_KEY_URL`}}"
}, },
"builders": [{ "builders": [{
"type": "amazon-ebs", "type": "amazon-ebs",
...@@ -51,7 +52,7 @@ ...@@ -51,7 +52,7 @@
"command": ". {{user `venv_dir`}}/bin/activate && ansible-playbook", "command": ". {{user `venv_dir`}}/bin/activate && ansible-playbook",
"inventory_groups": "jenkins_worker", "inventory_groups": "jenkins_worker",
"extra_arguments": [ "extra_arguments": [
"-e \"NEWRELIC_LICENSE_KEY={{user `new_relic_key`}}\"", "-e \"NEWRELIC_LICENSE_KEY={{user `new_relic_key`}} jenkins_worker_key_url='{{user `jenkins_worker_key_url`}}'\"",
"-vvv" "-vvv"
] ]
}] }]
......
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
"test_platform_version": "{{env `TEST_PLATFORM_VERSION`}}", "test_platform_version": "{{env `TEST_PLATFORM_VERSION`}}",
"security_group": "{{env `AWS_SECURITY_GROUP`}}", "security_group": "{{env `AWS_SECURITY_GROUP`}}",
"delete_or_keep": "{{env `DELETE_OR_KEEP_AMI`}}", "delete_or_keep": "{{env `DELETE_OR_KEEP_AMI`}}",
"remote_branch": "{{env `REMOTE_BRANCH`}}" "remote_branch": "{{env `REMOTE_BRANCH`}}",
"jenkins_worker_key_url": "{{env `JENKINS_WORKER_KEY_URL`}}"
}, },
"builders": [{ "builders": [{
"type": "amazon-ebs", "type": "amazon-ebs",
...@@ -52,7 +53,7 @@ ...@@ -52,7 +53,7 @@
"command": ". {{user `venv_dir`}}/bin/activate && ansible-playbook", "command": ". {{user `venv_dir`}}/bin/activate && ansible-playbook",
"inventory_groups": "jenkins_worker", "inventory_groups": "jenkins_worker",
"extra_arguments": [ "extra_arguments": [
"-e \"NEWRELIC_LICENSE_KEY={{user `new_relic_key`}}\"", "-e \"NEWRELIC_LICENSE_KEY={{user `new_relic_key`}} initialize_replica_set=false mongo_configure_replica_set=false jenkins_worker_key_url='{{user `jenkins_worker_key_url`}}'\"",
"-vvv" "-vvv"
] ]
}] }]
......
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