Chore: Upgrade common-packer to the latest v0.14.1

- Remove unwanted extra args from releng/builder packer
  templates.

Change-Id: Icff811ab7232ee23d7f4d2041275f6324e5ba262
Signed-off-by: Anil Belur <[email protected]>

diff --git a/packer/common-packer b/packer/common-packer
index 626eb9c0fbfd8cbc8115aacfa21ef07f55695d54..09cb3bcf48185afdc5af0a548be904491ae215de 160000 (submodule)
--- a/packer/common-packer
+++ b/packer/common-packer
@@ -1 +1 @@
-Subproject commit 626eb9c0fbfd8cbc8115aacfa21ef07f55695d54
+Subproject commit 09cb3bcf48185afdc5af0a548be904491ae215de

diff --git a/packer/templates/builder.json b/packer/templates/builder.json
index 8c7cb68ba5f1adae1a1d80c684accca42698b543..91327af37574dc55da1e5d82d27de3e7400f538c 100644 (file)
--- a/packer/templates/builder.json
+++ b/packer/templates/builder.json
@@ -66,9 +66,7 @@
         "ANSIBLE_STDOUT_CALLBACK=debug"
       ],
       "extra_arguments": [
-        "--scp-extra-args", "'-O'",
-        "--ssh-extra-args",
-        "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa"
+        "--ssh-extra-args", "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa"
       ]
     }
   ]

diff --git a/packer/templates/devstack-pre-pip-queens.json b/packer/templates/devstack-pre-pip-queens.json
index b774c67b919904bcdf457e90a24236f953c7ce3b..82db23da24fa76b3666387ad56fbf35e9d50b014 100644 (file)
--- a/packer/templates/devstack-pre-pip-queens.json
+++ b/packer/templates/devstack-pre-pip-queens.json
@@ -66,11 +66,8 @@
         "ANSIBLE_STDOUT_CALLBACK=debug"
       ],
       "extra_arguments": [
-        "--extra-vars",
-        "os_branch=stable/queens rdo_branch=queens",
-        "--scp-extra-args", "'-O'",
-        "--ssh-extra-args",
-        "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa"
+        "--extra-vars", "os_branch=stable/queens rdo_branch=queens",
+        "--ssh-extra-args", "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa"
       ]
     }
   ]

diff --git a/packer/templates/devstack-pre-pip-queens.pkr.hcl b/packer/templates/devstack-pre-pip-queens.pkr.hcl
index a12c12e090e306ead513f33831bdb493b72e81fc..6cabd835d08023111e03d6edd8c9987bf8ec5cba 100644 (file)
--- a/packer/templates/devstack-pre-pip-queens.pkr.hcl
+++ b/packer/templates/devstack-pre-pip-queens.pkr.hcl
@@ -159,8 +159,7 @@ build {
     command            = "./common-packer/ansible-playbook.sh"
     extra_arguments    = [
       "--extra-vars", "os_branch=stable/queens rdo_branch=queens",
-      "--scp-extra-args", "'-O'",
-      "--ssh-extra-args", "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa"
+      "--ssh-extra-args", "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa"
     ]
     playbook_file      = "provision/devstack-pre-pip-centos.yaml"
     skip_version_check = true

diff --git a/packer/templates/devstack-pre-pip-rocky.json b/packer/templates/devstack-pre-pip-rocky.json
index a6e68084be108e496cfbadf959318f5177081a1f..798464cf9e669d24c8a49d7d009156c6791832d0 100644 (file)
--- a/packer/templates/devstack-pre-pip-rocky.json
+++ b/packer/templates/devstack-pre-pip-rocky.json
@@ -67,11 +67,8 @@
         "ANSIBLE_STDOUT_CALLBACK=debug"
       ],
       "extra_arguments": [
-        "--extra-vars",
-        "os_branch=stable/queens rdo_branch=queens",
-        "--scp-extra-args", "'-O'",
-        "--ssh-extra-args",
-        "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa"
+        "--extra-vars", "os_branch=stable/queens rdo_branch=queens",
+        "--ssh-extra-args", "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa"
       ]
     }
   ]

diff --git a/packer/templates/devstack-pre-pip-rocky.pkr.hcl b/packer/templates/devstack-pre-pip-rocky.pkr.hcl
index e65dc54119efed4044a3a89a12a1d7a5a8084225..0e38aa0f8ea3e24da99ea80938fcfe0744502da8 100644 (file)
--- a/packer/templates/devstack-pre-pip-rocky.pkr.hcl
+++ b/packer/templates/devstack-pre-pip-rocky.pkr.hcl
@@ -159,8 +159,7 @@ build {
     command            = "./common-packer/ansible-playbook.sh"
     extra_arguments    = [
       "--extra-vars", "os_branch=stable/queens rdo_branch=queens",
-      "--scp-extra-args", "'-O'",
-      "--ssh-extra-args", "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa"
+      "--ssh-extra-args", "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa"
     ]
     playbook_file      = "provision/devstack-pre-pip-centos.yaml"
     skip_version_check = true

diff --git a/packer/templates/devstack-pre-pip-stein.json b/packer/templates/devstack-pre-pip-stein.json
index 18f9f24f2fcbb41aedf0542b6499dcb51d63b000..a38e23326b40916143300061dd64d4972d55e77a 100644 (file)
--- a/packer/templates/devstack-pre-pip-stein.json
+++ b/packer/templates/devstack-pre-pip-stein.json
@@ -67,11 +67,9 @@
         "ANSIBLE_STDOUT_CALLBACK=debug"
       ],
       "extra_arguments": [
-        "--extra-vars",
-        "os_branch=stable/queens rdo_branch=queens",
-        "--scp-extra-args", "'-O'",
+        "--extra-vars", "os_branch=stable/queens rdo_branch=queens",
         "--ssh-extra-args",
-        "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa"
+        "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa"
       ]
     }
   ]

diff --git a/packer/templates/devstack-pre-pip-stein.pkr.hcl b/packer/templates/devstack-pre-pip-stein.pkr.hcl
index 796be7a6b1e835b2bfd365156fa1ef219bf504e0..616344951e537bd918481ce40e6e9e1a4f198dd7 100644 (file)
--- a/packer/templates/devstack-pre-pip-stein.pkr.hcl
+++ b/packer/templates/devstack-pre-pip-stein.pkr.hcl
@@ -148,9 +148,19 @@ build {
   }
 
   provisioner "ansible" {
-    ansible_env_vars   = ["ANSIBLE_DEBUG=False", "ANSIBLE_NOCOWS=1", "ANSIBLE_PIPELINING=True", "ANSIBLE_ROLES_PATH=${var.ansible_roles_path}", "ANSIBLE_CALLBACK_WHITELIST=profile_tasks", "ANSIBLE_STDOUT_CALLBACK=debug"]
+    ansible_env_vars   = [
+      "ANSIBLE_DEBUG=False",
+      "ANSIBLE_NOCOWS=1",
+      "ANSIBLE_PIPELINING=True",
+      "ANSIBLE_ROLES_PATH=${var.ansible_roles_path}",
+      "ANSIBLE_CALLBACK_WHITELIST=profile_tasks",
+      "ANSIBLE_STDOUT_CALLBACK=debug"
+    ]
     command            = "./common-packer/ansible-playbook.sh"
-    extra_arguments    = ["--extra-vars", "os_branch=stable/queens rdo_branch=queens", "--scp-extra-args", "'-O'", "--ssh-extra-args", "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa"]
+    extra_arguments    = [
+      "--extra-vars", "os_branch=stable/queens rdo_branch=queens",
+      "--ssh-extra-args", "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa"
+    ]
     playbook_file      = "provision/devstack-pre-pip-centos.yaml"
     skip_version_check = true
   }

diff --git a/packer/templates/devstack-pre-pip-yoga.json b/packer/templates/devstack-pre-pip-yoga.json
index 8c406cdf23fb7a6cf367e5816ade0a8d5ce02364..159ef076640b3220fea8df380c7ff5c56442c31d 100644 (file)
--- a/packer/templates/devstack-pre-pip-yoga.json
+++ b/packer/templates/devstack-pre-pip-yoga.json
@@ -67,11 +67,9 @@
         "ANSIBLE_STDOUT_CALLBACK=debug"
       ],
       "extra_arguments": [
-        "--extra-vars",
-        "os_branch=stable/yoga rdo_branch=yoga",
-        "--scp-extra-args", "'-O'",
+        "--extra-vars", "os_branch=stable/yoga rdo_branch=yoga",
         "--ssh-extra-args",
-        "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa"
+        "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa"
       ]
     }
   ]

diff --git a/packer/templates/devstack-pre-pip-yoga.pkr.hcl b/packer/templates/devstack-pre-pip-yoga.pkr.hcl
index 030fb3f49038ba6bea9e2cba257029920af9c298..8c4e3f583cbd8ce4a5ff89ef1d07f01e75f16646 100644 (file)
--- a/packer/templates/devstack-pre-pip-yoga.pkr.hcl
+++ b/packer/templates/devstack-pre-pip-yoga.pkr.hcl
@@ -148,9 +148,20 @@ build {
   }
 
   provisioner "ansible" {
-    ansible_env_vars   = ["ANSIBLE_DEBUG=False", "ANSIBLE_NOCOWS=1", "ANSIBLE_PIPELINING=True", "ANSIBLE_ROLES_PATH=${var.ansible_roles_path}", "ANSIBLE_CALLBACK_WHITELIST=profile_tasks", "ANSIBLE_STDOUT_CALLBACK=debug"]
+    ansible_env_vars   = [
+        "ANSIBLE_NOCOWS=1",
+        "ANSIBLE_PIPELINING=False",
+        "ANSIBLE_HOST_KEY_CHECKING=False",
+        "ANSIBLE_ROLES_PATH=${var.ansible_roles_path}",
+        "ANSIBLE_CALLBACK_WHITELIST=profile_tasks",
+        "ANSIBLE_STDOUT_CALLBACK=debug"
+    ]
+    extra_arguments   = [
+      "--extra-vars", "os_branch=stable/yoga rdo_branch=yoga",
+      "--ssh-extra-args",
+      "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa"
+    ]
     command            = "./common-packer/ansible-playbook.sh"
-    extra_arguments    = ["--extra-vars", "os_branch=stable/yoga rdo_branch=yoga", "--scp-extra-args", "'-O'", "--ssh-extra-args", "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa"]
     playbook_file      = "provision/devstack-pre-pip-centos.yaml"
     skip_version_check = true
   }

diff --git a/packer/templates/devstack.json b/packer/templates/devstack.json
index ba82499f807f8dba07bf4b99a9682a682b0d930e..2ffa76f661297262763f5a89fcbc3fc523f0dc11 100644 (file)
--- a/packer/templates/devstack.json
+++ b/packer/templates/devstack.json
@@ -66,9 +66,8 @@
         "ANSIBLE_STDOUT_CALLBACK=debug"
       ],
       "extra_arguments": [
-        "--scp-extra-args", "'-O'",
         "--ssh-extra-args",
-        "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa"
+        "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa"
       ]
     }
   ]

diff --git a/packer/templates/devstack.pkr.hcl b/packer/templates/devstack.pkr.hcl
index 9a815e51f1e0af07a532a08035fd02666499a199..d7d178650054eab3aee6f3b39100e86548b733fe 100644 (file)
--- a/packer/templates/devstack.pkr.hcl
+++ b/packer/templates/devstack.pkr.hcl
@@ -148,9 +148,18 @@ build {
   }
 
   provisioner "ansible" {
-    ansible_env_vars   = ["ANSIBLE_NOCOWS=1", "ANSIBLE_PIPELINING=True", "ANSIBLE_ROLES_PATH=${var.ansible_roles_path}", "ANSIBLE_CALLBACK_WHITELIST=profile_tasks", "ANSIBLE_STDOUT_CALLBACK=debug"]
+    ansible_env_vars   = [
+        "ANSIBLE_NOCOWS=1",
+        "ANSIBLE_PIPELINING=False",
+        "ANSIBLE_HOST_KEY_CHECKING=False",
+        "ANSIBLE_ROLES_PATH=${var.ansible_roles_path}",
+        "ANSIBLE_CALLBACK_WHITELIST=profile_tasks",
+        "ANSIBLE_STDOUT_CALLBACK=debug"
+    ]
     command            = "./common-packer/ansible-playbook.sh"
-    extra_arguments    = ["--scp-extra-args", "'-O'", "--ssh-extra-args", "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa"]
+    extra_arguments    = [
+        "--ssh-extra-args", "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa"
+    ]
     playbook_file      = "provision/devstack-centos.yaml"
     skip_version_check = true
   }

diff --git a/packer/templates/helm.json b/packer/templates/helm.json
index 53543d350be6ccd43f1f186f864d7fa1d4e5898a..6586d52a09078385e3bc1f0867521b149c98242e 100644 (file)
--- a/packer/templates/helm.json
+++ b/packer/templates/helm.json
@@ -74,9 +74,8 @@
         "ANSIBLE_STDOUT_CALLBACK=debug"
       ],
       "extra_arguments": [
-        "--scp-extra-args", "'-O'",
         "--ssh-extra-args",
-        "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa"
+        "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa"
       ]
     }
   ]

diff --git a/packer/templates/helm.pkr.hcl b/packer/templates/helm.pkr.hcl
index d5bf3128643c4896ba3b026eabc802bce6e34ace..05f7e5e687c24187308ea07840857a967e7ab150 100644 (file)
--- a/packer/templates/helm.pkr.hcl
+++ b/packer/templates/helm.pkr.hcl
@@ -156,9 +156,18 @@ build {
   }
 
   provisioner "ansible" {
-    ansible_env_vars   = ["ANSIBLE_NOCOWS=1", "ANSIBLE_PIPELINING=True", "ANSIBLE_ROLES_PATH=${var.ansible_roles_path}", "ANSIBLE_CALLBACK_WHITELIST=profile_tasks", "ANSIBLE_STDOUT_CALLBACK=debug"]
+    ansible_env_vars   = [
+        "ANSIBLE_NOCOWS=1",
+        "ANSIBLE_PIPELINING=False",
+        "ANSIBLE_HOST_KEY_CHECKING=False",
+        "ANSIBLE_ROLES_PATH=${var.ansible_roles_path}",
+        "ANSIBLE_CALLBACK_WHITELIST=profile_tasks",
+        "ANSIBLE_STDOUT_CALLBACK=debug"
+    ]
     command            = "./common-packer/ansible-playbook.sh"
-    extra_arguments    = ["--scp-extra-args", "'-O'", "--ssh-extra-args", "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa"]
+    extra_arguments    = [
+        "--ssh-extra-args", "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa"
+    ]
     playbook_file      = "provision/helm.yaml"
     skip_version_check = true
   }

diff --git a/packer/templates/mininet-ovs-2.8.json b/packer/templates/mininet-ovs-2.8.json
index 29c5aba1e2cad5ba43a3ce8b83707c2958e407a2..89c23ec8f8c764873bcf2d8b3e390dc346b263b5 100644 (file)
--- a/packer/templates/mininet-ovs-2.8.json
+++ b/packer/templates/mininet-ovs-2.8.json
@@ -66,9 +66,8 @@
         "ANSIBLE_STDOUT_CALLBACK=debug"
       ],
       "extra_arguments": [
-        "--scp-extra-args", "'-O'",
         "--ssh-extra-args",
-        "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa"
+        "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa"
       ]
     }
   ]

diff --git a/packer/templates/mininet-ovs-2.8.pkr.hcl b/packer/templates/mininet-ovs-2.8.pkr.hcl
index c41478fc3274a16705fe0c194c30bddabfab6f4d..ff1852458c459b7fdc770c3b4ec8e69834076fe4 100644 (file)
--- a/packer/templates/mininet-ovs-2.8.pkr.hcl
+++ b/packer/templates/mininet-ovs-2.8.pkr.hcl
@@ -147,9 +147,18 @@ build {
   }
 
   provisioner "ansible" {
-    ansible_env_vars   = ["ANSIBLE_NOCOWS=1", "ANSIBLE_PIPELINING=True", "ANSIBLE_ROLES_PATH=${var.ansible_roles_path}", "ANSIBLE_CALLBACK_WHITELIST=profile_tasks", "ANSIBLE_STDOUT_CALLBACK=debug"]
+    ansible_env_vars   = [
+        "ANSIBLE_NOCOWS=1",
+        "ANSIBLE_PIPELINING=False",
+        "ANSIBLE_HOST_KEY_CHECKING=False",
+        "ANSIBLE_ROLES_PATH=${var.ansible_roles_path}",
+        "ANSIBLE_CALLBACK_WHITELIST=profile_tasks",
+        "ANSIBLE_STDOUT_CALLBACK=debug"
+    ]
     command            = "./common-packer/ansible-playbook.sh"
-    extra_arguments    = ["--scp-extra-args", "'-O'", "--ssh-extra-args", "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa"]
+    extra_arguments    = [
+        "--ssh-extra-args", "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa"
+    ]
     playbook_file      = "provision/mininet-ovs-2.8.yaml"
     skip_version_check = true
   }

diff --git a/packer/templates/robot.json b/packer/templates/robot.json
index 3b9c75ec49b5193f81634c4f7ddff9e22f6e8541..812e1c73ef4c286a2de2db05d5b83944d855e6b7 100644 (file)
--- a/packer/templates/robot.json
+++ b/packer/templates/robot.json
@@ -66,9 +66,8 @@
         "ANSIBLE_STDOUT_CALLBACK=debug"
       ],
       "extra_arguments": [
-        "--scp-extra-args", "'-O'",
         "--ssh-extra-args",
-        "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa"
+        "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa"
       ]
     }
   ]

diff --git a/packer/templates/robot.pkr.hcl b/packer/templates/robot.pkr.hcl
index 0815d964d3ffae99f4534ed0e61db61b1c6dc18d..64b6193a113a7d293b3018a46ca689828ea76912 100644 (file)
--- a/packer/templates/robot.pkr.hcl
+++ b/packer/templates/robot.pkr.hcl
@@ -148,9 +148,18 @@ build {
   }
 
   provisioner "ansible" {
-    ansible_env_vars   = ["ANSIBLE_NOCOWS=1", "ANSIBLE_PIPELINING=True", "ANSIBLE_ROLES_PATH=${var.ansible_roles_path}", "ANSIBLE_CALLBACK_WHITELIST=profile_tasks", "ANSIBLE_STDOUT_CALLBACK=debug"]
+    ansible_env_vars   = [
+        "ANSIBLE_NOCOWS=1",
+        "ANSIBLE_PIPELINING=False",
+        "ANSIBLE_HOST_KEY_CHECKING=False",
+        "ANSIBLE_ROLES_PATH=${var.ansible_roles_path}",
+        "ANSIBLE_CALLBACK_WHITELIST=profile_tasks",
+        "ANSIBLE_STDOUT_CALLBACK=debug"
+    ]
     command            = "./common-packer/ansible-playbook.sh"
-    extra_arguments    = ["--scp-extra-args", "'-O'", "--ssh-extra-args", "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa"]
+    extra_arguments    = [
+        "--ssh-extra-args", "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa"
+    ]
     playbook_file      = "provision/robot.yaml"
     skip_version_check = true
   }