Fix: packer templates for common-packer v0.12.1

The latest version of common-packer v0.12.1 pulls ansible
from PyPI, these changes are required to reflect the
submodule updates.

Change-Id: I53823e0753f42066b553963be28d4ec3ef206a44
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/packer/templates/builder.json b/packer/templates/builder.json
index ed13e01667d931b50ac62cb2dfee7a7b1fd6c772..51ebe88d98784076eea94c86c0ace2d56399dde4 100644 (file)
--- a/packer/templates/builder.json
+++ b/packer/templates/builder.json
@@ -56,6 +56,8 @@
     {
       "type": "ansible",
       "playbook_file": "provision/local-builder.yaml",
+      "command": "./common-packer/ansible-playbook.sh",
+      "skip_version_check": true,
       "ansible_env_vars": [
         "ANSIBLE_NOCOWS=1",
         "ANSIBLE_PIPELINING=True",

diff --git a/packer/templates/devstack-pre-pip-queens.json b/packer/templates/devstack-pre-pip-queens.json
index 23214fe85f5c258563fded8ab08e24186c52069f..170bdc0c7e41bc902a4d9c6910d348c56ffc6617 100644 (file)
--- a/packer/templates/devstack-pre-pip-queens.json
+++ b/packer/templates/devstack-pre-pip-queens.json
@@ -55,6 +55,8 @@
     {
       "type": "ansible",
       "playbook_file": "provision/devstack-pre-pip.yaml",
+      "command": "./common-packer/ansible-playbook.sh",
+      "skip_version_check": true,
       "ansible_env_vars": [
         "ANSIBLE_DEBUG=False",
         "ANSIBLE_NOCOWS=1",

diff --git a/packer/templates/devstack-pre-pip-rocky.json b/packer/templates/devstack-pre-pip-rocky.json
index a16ac897aacd74285beba21ccc415e9469e76640..175f82e43e0c1fb09b3c6f8d79aaac74d54d93bb 100644 (file)
--- a/packer/templates/devstack-pre-pip-rocky.json
+++ b/packer/templates/devstack-pre-pip-rocky.json
@@ -56,6 +56,8 @@
     {
       "type": "ansible",
       "playbook_file": "provision/devstack-pre-pip.yaml",
+      "command": "./common-packer/ansible-playbook.sh",
+      "skip_version_check": true,
       "ansible_env_vars": [
         "ANSIBLE_DEBUG=False",
         "ANSIBLE_NOCOWS=1",

diff --git a/packer/templates/devstack-pre-pip-stein.json b/packer/templates/devstack-pre-pip-stein.json
index f689b44126435a749ff6076eab08df5097d4f316..9abb28f4a90b702000f4203d65bf9d41fb436d2b 100644 (file)
--- a/packer/templates/devstack-pre-pip-stein.json
+++ b/packer/templates/devstack-pre-pip-stein.json
@@ -56,6 +56,8 @@
     {
       "type": "ansible",
       "playbook_file": "provision/devstack-pre-pip.yaml",
+      "command": "./common-packer/ansible-playbook.sh",
+      "skip_version_check": true,
       "ansible_env_vars": [
         "ANSIBLE_DEBUG=False",
         "ANSIBLE_NOCOWS=1",

diff --git a/packer/templates/devstack.json b/packer/templates/devstack.json
index c5ca7d4a701a855085fbf1482539e262d212d562..98a1f13e072bf618489d61af1a87d050fdf1de1e 100644 (file)
--- a/packer/templates/devstack.json
+++ b/packer/templates/devstack.json
@@ -56,6 +56,8 @@
     {
       "type": "ansible",
       "playbook_file": "provision/devstack.yaml",
+      "command": "./common-packer/ansible-playbook.sh",
+      "skip_version_check": true,
       "ansible_env_vars": [
         "ANSIBLE_NOCOWS=1",
         "ANSIBLE_PIPELINING=True",

diff --git a/packer/templates/helm.json b/packer/templates/helm.json
index 636ec46a424da2e5fa1750cd0a5d349650b426dc..f45c042d728f8e029ea1ffeff83c56ecdff31e18 100644 (file)
--- a/packer/templates/helm.json
+++ b/packer/templates/helm.json
@@ -64,6 +64,8 @@
     {
       "type": "ansible",
       "playbook_file": "provision/helm.yaml",
+      "command": "./common-packer/ansible-playbook.sh",
+      "skip_version_check": true,
       "ansible_env_vars": [
         "ANSIBLE_NOCOWS=1",
         "ANSIBLE_PIPELINING=True",

diff --git a/packer/templates/mininet-ovs-2.8.json b/packer/templates/mininet-ovs-2.8.json
index 544c685b9094856863f1afa97804d2e0fb262eeb..9c08471604f73d77671ba167bc07f71ceab00c5d 100644 (file)
--- a/packer/templates/mininet-ovs-2.8.json
+++ b/packer/templates/mininet-ovs-2.8.json
@@ -56,6 +56,8 @@
     {
       "type": "ansible",
       "playbook_file": "provision/mininet-ovs-2.8.yaml",
+      "command": "./common-packer/ansible-playbook.sh",
+      "skip_version_check": true,
       "ansible_env_vars": [
         "ANSIBLE_NOCOWS=1",
         "ANSIBLE_PIPELINING=True",

diff --git a/packer/templates/robot.json b/packer/templates/robot.json
index fb28e691b39aa2b43b39d6bd167b057ba1ce50bf..17937e2c04c39e0d5c143423c384fb105f63aec4 100644 (file)
--- a/packer/templates/robot.json
+++ b/packer/templates/robot.json
@@ -56,6 +56,8 @@
     {
       "type": "ansible",
       "playbook_file": "provision/robot.yaml",
+      "command": "./common-packer/ansible-playbook.sh",
+      "skip_version_check": true,
       "ansible_env_vars": [
         "ANSIBLE_NOCOWS=1",
         "ANSIBLE_PIPELINING=True",