aboutsummaryrefslogtreecommitdiffstats
path: root/packer
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2018-07-11 13:06:28 +0200
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2018-07-11 13:06:28 +0200
commite246597b9ed33b45e52cd092a4d7a26b697722e7 (patch)
tree8cdf0dbe96741fb3683e2f5d412686b94cad84a6 /packer
parent088e03a37b21be7f1db29deed7a7b208c5395626 (diff)
Uprev templates to apiv3
Change-Id: I7b4e12e450534d7923af10b779b12f0cbe68e52a Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'packer')
-rw-r--r--packer/templates/basebuild-agl-test-slave.json19
-rw-r--r--packer/templates/basebuild-control-slave.json19
-rw-r--r--packer/templates/basebuild.json17
3 files changed, 35 insertions, 20 deletions
diff --git a/packer/templates/basebuild-agl-test-slave.json b/packer/templates/basebuild-agl-test-slave.json
index de056b27..e6e3d34b 100644
--- a/packer/templates/basebuild-agl-test-slave.json
+++ b/packer/templates/basebuild-agl-test-slave.json
@@ -12,21 +12,26 @@
},
"builders": [
{
+ "name": "vexxhost",
+ "image_name": "{{user `distro`}} - basebuild-agl-test-slave - {{isotime \"20060102-1504\"}}",
+ "source_image_name": "{{user `base_image`}}",
"type": "openstack",
- "identity_endpoint": "https://auth.vexxhost.net/v2.0/",
- "tenant_name": "{{user `stack_tenant`}}",
+ "identity_endpoint": "https://auth.vexxhost.net/v3/",
"username": "{{user `stack_user`}}",
"password": "{{user `stack_pass`}}",
+ "tenant_name": "{{user `stack_tenant`}}",
+ "domain_name": "Default",
"region": "ca-ymq-1",
- "ssh_username": "{{user `cloud_user`}}",
- "image_name": "{{user `distro`}} - basebuild-agl-test-slave - {{isotime \"20060102-1504\"}}",
- "source_image_name": "{{user `base_image`}}",
- "flavor": "v1-standard-16",
"availability_zone": "ca-ymq-2",
"networks": [
"{{user `stack_network`}}"
],
- "user_data_file": "{{user `cloud_user_data`}}"
+ "user_data_file": "{{user `cloud_user_data`}}",
+ "ssh_username": "{{user `cloud_user`}}",
+ "flavor": "v1-standard-16",
+ "metadata": {
+ "ci_managed": "yes"
+ }
}
],
"provisioners": [
diff --git a/packer/templates/basebuild-control-slave.json b/packer/templates/basebuild-control-slave.json
index 9da3ed8b..9a29d85e 100644
--- a/packer/templates/basebuild-control-slave.json
+++ b/packer/templates/basebuild-control-slave.json
@@ -12,21 +12,26 @@
},
"builders": [
{
+ "name": "vexxhost",
+ "image_name": "{{user `distro`}} - basebuild-control-slave - {{isotime \"20060102-1504\"}}",
+ "source_image_name": "{{user `base_image`}}",
"type": "openstack",
- "identity_endpoint": "https://auth.vexxhost.net/v2.0/",
- "tenant_name": "{{user `stack_tenant`}}",
+ "identity_endpoint": "https://auth.vexxhost.net/v3/",
"username": "{{user `stack_user`}}",
"password": "{{user `stack_pass`}}",
+ "tenant_name": "{{user `stack_tenant`}}",
+ "domain_name": "Default",
"region": "ca-ymq-1",
- "ssh_username": "{{user `cloud_user`}}",
- "image_name": "{{user `distro`}} - basebuild-control-slave - {{isotime \"20060102-1504\"}}",
- "source_image_name": "{{user `base_image`}}",
- "flavor": "v1-standard-16",
"availability_zone": "ca-ymq-2",
"networks": [
"{{user `stack_network`}}"
],
- "user_data_file": "{{user `cloud_user_data`}}"
+ "user_data_file": "{{user `cloud_user_data`}}",
+ "ssh_username": "{{user `cloud_user`}}",
+ "flavor": "v1-standard-16",
+ "metadata": {
+ "ci_managed": "yes"
+ }
}
],
"provisioners": [
diff --git a/packer/templates/basebuild.json b/packer/templates/basebuild.json
index 96d41812..ba5e1a8a 100644
--- a/packer/templates/basebuild.json
+++ b/packer/templates/basebuild.json
@@ -12,21 +12,26 @@
},
"builders": [
{
+ "name": "vexxhost",
+ "image_name": "{{user `distro`}} - basebuild - {{isotime \"20060102-1504\"}}",
+ "source_image_name": "{{user `base_image`}}",
"type": "openstack",
"identity_endpoint": "https://auth.vexxhost.net/v3/",
- "tenant_name": "{{user `stack_tenant`}}",
"username": "{{user `stack_user`}}",
"password": "{{user `stack_pass`}}",
+ "tenant_name": "{{user `stack_tenant`}}",
+ "domain_name": "Default",
"region": "ca-ymq-1",
- "ssh_username": "{{user `cloud_user`}}",
- "image_name": "{{user `distro`}} - basebuild - {{isotime \"20060102-1504\"}}",
- "source_image_name": "{{user `base_image`}}",
- "flavor": "v1-standard-16",
"availability_zone": "ca-ymq-2",
"networks": [
"{{user `stack_network`}}"
],
- "user_data_file": "{{user `cloud_user_data`}}"
+ "user_data_file": "{{user `cloud_user_data`}}",
+ "ssh_username": "{{user `cloud_user`}}",
+ "flavor": "v1-standard-16",
+ "metadata": {
+ "ci_managed": "yes"
+ }
}
],
"provisioners": [