chore(ci): replace ssh-keyscan use of unsupported -o

Signed-off-by: Marques Johansson <[email protected]>
equinix-labs · Aug 13, 2024 · a31ee50 · a31ee50
1 parent 29cb576
commit a31ee50
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -84,10 +84,9 @@ jobs:
         terraform apply -input=false tfplan
         ssh-add $(terraform output -raw ssh_private_key)
         ssh-keyscan -H $(terraform output -raw bastion_public_ip) >> ~/.ssh/known_hosts
-        ssh-keyscan -H -p 22 -t rsa -T 10 -O StrictHostKeyChecking=no -O "ProxyCommand=ssh -W %h:%p root@$(terraform output -raw bastion_public_ip)" $(terraform output -raw cvim_ip_address) >> ~/.ssh/known_hosts
         # Show meaningful status via "cluster status". alternatively, "ncc health_checks run_all", which can take a while
         # For more commands: https://portal.nutanix.com/page/documents/kbs/details?targetId=kA07V000000LVVSSA4
-        ssh -j root@$(terraform output -raw bastion_public_ip) nutanix@$(terraform output -raw cvim_ip_address) cluster status
+        ssh -o StrictHostKeyChecking=no -j root@$(terraform output -raw bastion_public_ip) nutanix@$(terraform output -raw cvim_ip_address) cluster status
     - name: Terraform Destroy with Retry
       id: destroy
       if: ${{ always() }}

diff --git a/examples/cluster-migration/terraform.tfvars.example b/examples/cluster-migration/terraform.tfvars.example
@@ -2,7 +2,7 @@
 # metal_project_id       = ""                               # The ID of the Metal project in which to deploy to cluster if `create_project` is false.
 # metal_organization_id  = ""                               # The ID of the Metal organization in which to create the project if `create_project` is true.
 # metal_metro            = "sl"                             # The metro to create the cluster in
-# metal_nutanix_os       = "nutanix_lts_6_5"                # The Equinix Metal Nutanix OS image to deploy. nutanix_lts_6_5 requires reserved hardware. nutanix_lts_6_5_poc may be available upon request. 
+# metal_nutanix_os       = "nutanix_lts_6_5"                # The Equinix Metal Nutanix OS image to deploy. nutanix_lts_6_5 requires reserved hardware. nutanix_lts_6_5_poc may be available upon request.
 # create_project         = false                            # (Optional) to use an existing project matching `metal_project_name`, set this to false.
 # create_vlan            = false                            # Whether to create a new VLAN for this project.
 # create_vrf             = true