From 3ca15af3b33832496e76c9bdb95a08c9d8d936ef Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Wed, 2 Oct 2019 13:39:25 +0530 Subject: [PATCH] Update the packer templates in releng/builder - Add the arch type to image name, which is required for auto-updating images. - Re-factor templates files with user vars similar to the templates in common-packer. Change-Id: I78a63cddc857aabfa1e1177060267e4146d55ff0 Signed-off-by: Anil Belur --- packer/templates/devstack-pre-pip-queens.json | 26 +++++++++----- packer/templates/devstack-pre-pip-rocky.json | 11 ++++-- packer/templates/devstack-pre-pip-stein.json | 26 +++++++++----- packer/templates/devstack.json | 26 +++++++++----- packer/templates/gbp.json | 34 ++++++++++++------- packer/templates/kubernetes.json | 11 ++++-- packer/templates/mininet-ovs-2.5.json | 26 +++++++++----- packer/templates/mininet-ovs-2.6.json | 26 +++++++++----- packer/templates/mininet-ovs-2.8.json | 26 +++++++++----- packer/templates/robot.json | 26 +++++++++----- 10 files changed, 159 insertions(+), 79 deletions(-) diff --git a/packer/templates/devstack-pre-pip-queens.json b/packer/templates/devstack-pre-pip-queens.json index 367ef8b40..c3b921de0 100644 --- a/packer/templates/devstack-pre-pip-queens.json +++ b/packer/templates/devstack-pre-pip-queens.json @@ -1,32 +1,40 @@ { "variables": { "ansible_roles_path": ".galaxy", + "arch": "x86_64", "base_image": null, - "distro": 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", - "image_name": "ZZCI - {{user `distro`}} - devstack-queens - {{isotime \"20060102-150405.000\"}}", + "image_name": "ZZCI - {{user `distro`}} - devstack-queens - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}", "instance_name": "{{user `distro`}}-devstack-queens-{{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`}}", - "flavor": "v1-standard-1", + "flavor": "{{user `flavor`}}", "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": [ diff --git a/packer/templates/devstack-pre-pip-rocky.json b/packer/templates/devstack-pre-pip-rocky.json index 7798f97be..65171a716 100644 --- a/packer/templates/devstack-pre-pip-rocky.json +++ b/packer/templates/devstack-pre-pip-rocky.json @@ -1,17 +1,24 @@ { "variables": { "ansible_roles_path": ".galaxy", + "arch": "x86_64", "base_image": null, - "distro": 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", - "image_name": "ZZCI - {{user `distro`}} - devstack-rocky - {{isotime \"20060102-150405.000\"}}", + "image_name": "ZZCI - {{user `distro`}} - devstack-rocky - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}", "instance_name": "{{user `distro`}}-devstack-rocky-{{uuid}}", "source_image_name": "{{user `base_image`}}", "type": "openstack", diff --git a/packer/templates/devstack-pre-pip-stein.json b/packer/templates/devstack-pre-pip-stein.json index f4a14a35b..97e6f2e00 100644 --- a/packer/templates/devstack-pre-pip-stein.json +++ b/packer/templates/devstack-pre-pip-stein.json @@ -1,32 +1,40 @@ { "variables": { "ansible_roles_path": ".galaxy", + "arch": "x86_64", "base_image": null, - "distro": 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", - "image_name": "ZZCI - {{user `distro`}} - devstack-stein - {{isotime \"20060102-150405.000\"}}", + "image_name": "ZZCI - {{user `distro`}} - devstack-stein - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}", "instance_name": "{{user `distro`}}-devstack-stein-{{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`}}", - "flavor": "v1-standard-1", + "flavor": "{{user `flavor`}}", "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": [ diff --git a/packer/templates/devstack.json b/packer/templates/devstack.json index 274f95c17..f65fc8431 100644 --- a/packer/templates/devstack.json +++ b/packer/templates/devstack.json @@ -1,32 +1,40 @@ { "variables": { "ansible_roles_path": ".galaxy", + "arch": "x86_64", "base_image": null, - "distro": 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", - "image_name": "ZZCI - {{user `distro`}} - devstack - {{isotime \"20060102-150405.000\"}}", + "image_name": "ZZCI - {{user `distro`}} - devstack - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}", "instance_name": "{{user `distro`}}-devstack-{{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`}}", - "flavor": "v1-standard-1", + "flavor": "{{user `flavor`}}", "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": [ diff --git a/packer/templates/gbp.json b/packer/templates/gbp.json index a99caf9b9..4ef3a9f94 100644 --- a/packer/templates/gbp.json +++ b/packer/templates/gbp.json @@ -1,30 +1,40 @@ { "variables": { + "ansible_roles_path": ".galaxy", + "arch": "x86_64", "base_image": null, - "distro": 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": [ { - "type": "openstack", - "region": "ca-ymq-1", - "availability_zone": "ca-ymq-2", - "ssh_username": "{{user `ssh_user`}}", - "ssh_proxy_host": "{{user `ssh_proxy_host`}}", - "image_name": "ZZCI - {{user `distro`}} - gbp - {{isotime \"20060102-150405.000\"}}", + "name": "vexxhost", + "image_name": "ZZCI - {{user `distro`}} - gbp - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}", "instance_name": "{{user `distro`}}-gbp-{{uuid}}", "source_image_name": "{{user `base_image`}}", - "flavor": "v1-standard-1", - "networks": [ - "{{user `cloud_network`}}" - ], + "type": "openstack", + "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`}}", + "flavor": "{{user `flavor`}}", "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": [ diff --git a/packer/templates/kubernetes.json b/packer/templates/kubernetes.json index d9c88a39c..1e972c076 100644 --- a/packer/templates/kubernetes.json +++ b/packer/templates/kubernetes.json @@ -1,17 +1,24 @@ { "variables": { "ansible_roles_path": "roles/coe", + "arch": "x86_64", "base_image": null, - "distro": 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", - "image_name": "ZZCI - {{user `distro`}} - kubernetes - {{isotime \"20060102-150405.000\"}}", + "image_name": "ZZCI - {{user `distro`}} - kubernetes - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}", "instance_name": "{{user `distro`}}-kubernetes-{{uuid}}", "source_image_name": "{{user `base_image`}}", "type": "openstack", diff --git a/packer/templates/mininet-ovs-2.5.json b/packer/templates/mininet-ovs-2.5.json index df2372f14..c41f0c95e 100644 --- a/packer/templates/mininet-ovs-2.5.json +++ b/packer/templates/mininet-ovs-2.5.json @@ -1,32 +1,40 @@ { "variables": { "ansible_roles_path": ".galaxy", + "arch": "x86_64", "base_image": null, - "distro": 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", - "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", - "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`}}", - "flavor": "v1-standard-1", + "flavor": "{{user `flavor`}}", "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": [ diff --git a/packer/templates/mininet-ovs-2.6.json b/packer/templates/mininet-ovs-2.6.json index 85a70be34..fa999a7f6 100644 --- a/packer/templates/mininet-ovs-2.6.json +++ b/packer/templates/mininet-ovs-2.6.json @@ -1,32 +1,40 @@ { "variables": { "ansible_roles_path": ".galaxy", + "arch": "x86_64", "base_image": null, - "distro": 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", - "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-26 - {{isotime \"20060102-150405.000\"}}", + "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-26 - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}", "instance_name": "{{user `distro`}}-mininet-ovs-26-{{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`}}", - "flavor": "v1-standard-1", + "flavor": "{{user `flavor`}}", "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": [ diff --git a/packer/templates/mininet-ovs-2.8.json b/packer/templates/mininet-ovs-2.8.json index 68f0e5212..c1d1fd3fb 100644 --- a/packer/templates/mininet-ovs-2.8.json +++ b/packer/templates/mininet-ovs-2.8.json @@ -1,32 +1,40 @@ { "variables": { "ansible_roles_path": ".galaxy", + "arch": "x86_64", "base_image": null, - "distro": 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", - "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-28 - {{isotime \"20060102-150405.000\"}}", + "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-28 - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}", "instance_name": "{{user `distro`}}-mininet-ovs-28-{{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`}}", - "flavor": "v1-standard-1", + "flavor": "{{user `flavor`}}", "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": [ diff --git a/packer/templates/robot.json b/packer/templates/robot.json index a6b56635f..9c0c63f3e 100644 --- a/packer/templates/robot.json +++ b/packer/templates/robot.json @@ -1,32 +1,40 @@ { "variables": { "ansible_roles_path": ".galaxy", + "arch": "x86_64", "base_image": null, - "distro": 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", - "image_name": "ZZCI - {{user `distro`}} - robot - {{isotime \"20060102-150405.000\"}}", + "image_name": "ZZCI - {{user `distro`}} - robot - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}", "instance_name": "{{user `distro`}}-robot-{{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`}}", - "flavor": "v1-standard-1", + "flavor": "{{user `flavor`}}", "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": [ -- 2.36.6