Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add upgrade tests job"
[releng/builder.git]
/
packer
/
templates
/
robot.json
diff --git
a/packer/templates/robot.json
b/packer/templates/robot.json
index 15b115eadf23bcd8b721c40acbe869f2816b0a36..a6b56635fee54e89915e0a800e11d3d77e404185 100644
(file)
--- a/
packer/templates/robot.json
+++ b/
packer/templates/robot.json
@@
-1,12
+1,9
@@
{
"variables": {
{
"variables": {
+ "ansible_roles_path": ".galaxy",
"base_image": null,
"distro": null,
"base_image": null,
"distro": null,
- "cloud_auth_url": null,
- "cloud_user": null,
- "cloud_pass": null,
"cloud_network": null,
"cloud_network": null,
- "cloud_tenant": null,
"cloud_user_data": null,
"ssh_user": null,
"ssh_proxy_host": ""
"cloud_user_data": null,
"ssh_user": null,
"ssh_proxy_host": ""
@@
-15,13
+12,9
@@
{
"name": "vexxhost",
"image_name": "ZZCI - {{user `distro`}} - robot - {{isotime \"20060102-150405.000\"}}",
{
"name": "vexxhost",
"image_name": "ZZCI - {{user `distro`}} - robot - {{isotime \"20060102-150405.000\"}}",
+ "instance_name": "{{user `distro`}}-robot-{{uuid}}",
"source_image_name": "{{user `base_image`}}",
"type": "openstack",
"source_image_name": "{{user `base_image`}}",
"type": "openstack",
- "identity_endpoint": "{{user `cloud_auth_url`}}",
- "username": "{{user `cloud_user`}}",
- "password": "{{user `cloud_pass`}}",
- "tenant_name": "{{user `cloud_tenant`}}",
- "domain_name": "Default",
"region": "ca-ymq-1",
"availability_zone": "ca-ymq-2",
"networks": [
"region": "ca-ymq-1",
"availability_zone": "ca-ymq-2",
"networks": [
@@
-44,13
+37,17
@@
],
"execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
},
],
"execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
},
+ {
+ "type": "shell-local",
+ "command": "./common-packer/ansible-galaxy.sh {{user `ansible_roles_path`}}"
+ },
{
"type": "ansible",
"playbook_file": "provision/robot.yaml",
"ansible_env_vars": [
"ANSIBLE_NOCOWS=1",
"ANSIBLE_PIPELINING=True",
{
"type": "ansible",
"playbook_file": "provision/robot.yaml",
"ansible_env_vars": [
"ANSIBLE_NOCOWS=1",
"ANSIBLE_PIPELINING=True",
- "ANSIBLE_ROLES_PATH=
../lf-ansible/roles
",
+ "ANSIBLE_ROLES_PATH=
{{user `ansible_roles_path`}}
",
"ANSIBLE_CALLBACK_WHITELIST=profile_tasks",
"ANSIBLE_STDOUT_CALLBACK=debug"
]
"ANSIBLE_CALLBACK_WHITELIST=profile_tasks",
"ANSIBLE_STDOUT_CALLBACK=debug"
]