patch: merging upstream

eschercloudai · Oct 26, 2022 · e436979 · e436979
1 parent 17ea4a3
commit e436979
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/images/capi/packer/openstack/openstack-ubuntu-2004.json b/images/capi/packer/openstack/openstack-ubuntu-2004.json
@@ -5,8 +5,8 @@
   "os_display_name": "Ubuntu 20.04",
   "shutdown_command": "shutdown -P now",
   "ssh_username": "ubuntu",
-  "source_image": "c5eb4dd2-a35f-4c7f-8095-c28f2c64b924",
-  "networks": "dbbcf56d-940d-42e1-a550-3c38c5999dee",
-  "flavor": "vgpu.mig.1g10gb",
-  "floating_ip_pool": "public1"
+  "source_image": "6641b3e4-4b2d-409b-8340-067e50ec1ab7",
+  "networks": "05cfe5ff-d25d-497e-bf3a-5699bc3cf17f",
+  "flavor": "chorizo",
+  "floating_ip_pool": "legacy_internet"
 }
diff --git a/images/capi/packer/openstack/packer.json b/images/capi/packer/openstack/packer.json
@@ -38,9 +38,10 @@
     },
     {
       "ansible_env_vars": [
-        "ANSIBLE_SSH_ARGS='{{user `existing_ansible_ssh_args`}} -o IdentitiesOnly=yes'"
+        "ANSIBLE_SSH_ARGS='{{user `existing_ansible_ssh_args`}} -oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedAlgorithms=+ssh-rsa -o IdentitiesOnly=yes'"
       ],
       "extra_arguments": [
+        "--scp-extra-args", "'-O'",
         "--extra-vars",
         "{{user `ansible_common_vars`}}",
         "--extra-vars",
@@ -62,9 +63,10 @@
     },
     {
       "ansible_env_vars": [
-        "ANSIBLE_SSH_ARGS='{{user `existing_ansible_ssh_args`}} -o IdentitiesOnly=yes'"
+        "ANSIBLE_SSH_ARGS='{{user `existing_ansible_ssh_args`}} -oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedAlgorithms=+ssh-rsa -o IdentitiesOnly=yes'"
       ],
       "extra_arguments": [
+        "--scp-extra-args", "'-O'",
         "--extra-vars",
         "{{user `ansible_common_vars`}}",
         "--extra-vars",
@@ -111,7 +113,6 @@
     "ansible_common_vars": "",
     "ansible_extra_vars": "ansible_python_interpreter=/usr/bin/python3",
     "ansible_user_vars": "",
-    "boot_media_path": "http://{{ .HTTPIP }}:{{ .HTTPPort }}",
     "boot_wait": "10s",
     "build_timestamp": "{{timestamp}}",
     "containerd_sha256": null,
@@ -127,7 +128,7 @@
     "firmware": "",
     "format": "qcow2",
     "headless": "true",
-    "http_directory": "./packer/qemu/linux/{{user `distro_name`}}/http/",
+    "http_directory": "./packer/openstack/linux/{{user `distro_name`}}/http/",
     "kubernetes_cni_deb_version": null,
     "kubernetes_cni_http_source": null,
     "kubernetes_cni_semver": null,
@@ -147,10 +148,8 @@
     "kubernetes_source_type": null,
     "machine_id_mode": "444",
     "memory": "2048",
-    "output_directory": "./output/{{user `build_name`}}-kube-{{user `kubernetes_semver`}}",
     "python_path": "",
     "qemu_binary": "qemu-system-x86_64",
-    "ssh_password": "builder",
-    "ssh_username": "builder"
+    "ssh_username": "{{user `ssh_username`}}"
   }
 }