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
Auto-generated patches to resolve prettier / yamllint
[releng/builder.git]
/
packer
/
templates
/
mininet-ovs-2.5.json
diff --git
a/packer/templates/mininet-ovs-2.5.json
b/packer/templates/mininet-ovs-2.5.json
index df2372f14e2ce70834aaef08d806b8d556248b9d..804a279e7c9e238f7522c36894c56d32d397dcb4 100644
(file)
--- a/
packer/templates/mininet-ovs-2.5.json
+++ b/
packer/templates/mininet-ovs-2.5.json
@@
-1,40
+1,46
@@
{
"variables": {
"ansible_roles_path": ".galaxy",
{
"variables": {
"ansible_roles_path": ".galaxy",
+ "arch": "x86_64",
"base_image": null,
"base_image": null,
- "distro": null,
"cloud_network": null,
"cloud_user_data": null,
"cloud_network": null,
"cloud_user_data": null,
+ "cloud_region": "ca-ymq-1",
+ "cloud_availability_zone": "ca-ymq-2",
+ "vm_use_block_storage": "true",
+ "vm_volume_size": "20",
+ "vm_image_disk_format": "",
+ "distro": null,
+ "flavor": "v2-highcpu-1",
"ssh_user": null,
"ssh_proxy_host": ""
},
"builders": [
{
"name": "vexxhost",
"ssh_user": null,
"ssh_proxy_host": ""
},
"builders": [
{
"name": "vexxhost",
- "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-25 - {{isotime \"20060102-150405.000\"}}",
+ "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-25 - {{
user `arch`}} - {{
isotime \"20060102-150405.000\"}}",
"instance_name": "{{user `distro`}}-mininet-ovs-25-{{uuid}}",
"source_image_name": "{{user `base_image`}}",
"type": "openstack",
"instance_name": "{{user `distro`}}-mininet-ovs-25-{{uuid}}",
"source_image_name": "{{user `base_image`}}",
"type": "openstack",
- "region": "ca-ymq-1",
- "availability_zone": "ca-ymq-2",
- "networks": [
- "{{user `cloud_network`}}"
- ],
+ "region": "{{user `cloud_region`}}",
+ "availability_zone": "{{user `cloud_availability_zone`}}",
+ "networks": ["{{user `cloud_network`}}"],
"user_data_file": "{{user `cloud_user_data`}}",
"ssh_username": "{{user `ssh_user`}}",
"ssh_proxy_host": "{{user `ssh_proxy_host`}}",
"user_data_file": "{{user `cloud_user_data`}}",
"ssh_username": "{{user `ssh_user`}}",
"ssh_proxy_host": "{{user `ssh_proxy_host`}}",
- "flavor": "
v1-standard-1
",
+ "flavor": "
{{user `flavor`}}
",
"metadata": {
"ci_managed": "yes"
"metadata": {
"ci_managed": "yes"
- }
+ },
+ "use_blockstorage_volume": "{{user `vm_use_block_storage`}}",
+ "volume_size": "{{user `vm_volume_size`}}",
+ "image_disk_format": "{{user `vm_image_disk_format`}}"
}
],
"provisioners": [
{
"type": "shell",
}
],
"provisioners": [
{
"type": "shell",
- "scripts": [
- "common-packer/provision/install-python.sh"
- ],
+ "scripts": ["common-packer/provision/install-python.sh"],
"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"
},
{