Chore: Upgrade projects to use JDK17

[releng/builder.git] / packer / templates / devstack-pre-pip-rocky.json

diff --git a/packer/templates/devstack-pre-pip-rocky.json b/packer/templates/devstack-pre-pip-rocky.json
index c976afc234ec711557e5621659414e0a82372bcf..2fc8882930472c294cb30c66769f16ee292259ca 100644 (file)
--- a/packer/templates/devstack-pre-pip-rocky.json
+++ b/packer/templates/devstack-pre-pip-rocky.json
@@ -10,7 +10,8 @@
     "vm_volume_size": "20",
     "vm_image_disk_format": "",
     "distro": null,
-    "flavor": "v2-highcpu-1",
+    "docker_source_image": null,
+    "flavor": "v3-standard-2",
     "ssh_user": null,
     "ssh_proxy_host": ""
   },
@@ -21,15 +22,25 @@
       "instance_name": "{{user `distro`}}-devstack-rocky-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
-      "region": "ca-ymq-1",
+      "region": "{{user `cloud_region`}}",
       "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`}}"
+    },
+    {
+      "name": "docker",
+      "type": "docker",
+      "image": "{{ user `docker_source_image` }}",
+      "commit": true,
+      "changes": ["ENTRYPOINT [\"\"]", "CMD [\"\"]"]
     }
   ],
   "provisioners": [
@@ -44,7 +55,9 @@
     },
     {
       "type": "ansible",
-      "playbook_file": "provision/devstack-pre-pip.yaml",
+      "playbook_file": "provision/devstack-pre-pip-centos.yaml",
+      "command": "./common-packer/ansible-playbook.sh",
+      "skip_version_check": true,
       "ansible_env_vars": [
         "ANSIBLE_DEBUG=False",
         "ANSIBLE_NOCOWS=1",
@@ -55,7 +68,9 @@
       ],
       "extra_arguments": [
         "--extra-vars",
-        "os_branch=stable/rocky rdo_branch=rocky"
+        "os_branch=stable/queens rdo_branch=queens",
+        "--ssh-extra-args",
+        "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa"
       ]
     }
   ]