Added different usage for packer build with local env file

this is after the reject in review - 51587
I have tested this change in our local env and got through
the image creation.
Kindly see if fits.

Change-Id: I7986da257ac4cc659aa943becf5413c14284d9bd
Signed-off-by: Guy Belotzerkovsky <guy@hpe.com>

diff --git a/packer/provision/system_reseal_local_env.sh b/packer/provision/system_reseal_local_env.sh
new file mode 100644 (file)
index 0000000..041fffe
--- /dev/null
+++ b/packer/provision/system_reseal_local_env.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+# Here add local env changes.

diff --git a/packer/templates/baseline.json b/packer/templates/baseline.json
index d0d304fe0cece9fe4fc8ab345398640eb590c942..f042b0836d026babfadaf8ef9c78f698461e7adf 100644 (file)
--- a/packer/templates/baseline.json
+++ b/packer/templates/baseline.json
@@ -59,6 +59,7 @@
       "type": "shell",
       "scripts": [
         "provision/baseline.sh",
+        "provision/system_reseal_local_env.sh",
         "provision/system_reseal.sh"
       ],
       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"

diff --git a/packer/templates/devstack-pre-pip-mitaka.json b/packer/templates/devstack-pre-pip-mitaka.json
index 3676ae31bf723ac0443fe68d5930e1efa2d8ba1f..25b0244cf2a01b622ca0e772bcf5268b34c62de4 100644 (file)
--- a/packer/templates/devstack-pre-pip-mitaka.json
+++ b/packer/templates/devstack-pre-pip-mitaka.json
@@ -63,6 +63,7 @@
       "scripts": [
         "provision/baseline.sh",
         "provision/devstack-pre-pip.sh",
+        "provision/system_reseal_local_env.sh",
         "provision/system_reseal.sh"
       ],
       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"

diff --git a/packer/templates/devstack-pre-pip-newton.json b/packer/templates/devstack-pre-pip-newton.json
index 99e5fe7bf091f6563b84b68f618fbbde1d445d90..d166632ce695a4268fc080273263da5e7b8dad99 100644 (file)
--- a/packer/templates/devstack-pre-pip-newton.json
+++ b/packer/templates/devstack-pre-pip-newton.json
@@ -63,6 +63,7 @@
       "scripts": [
         "provision/baseline.sh",
         "provision/devstack-pre-pip.sh",
+        "provision/system_reseal_local_env.sh",
         "provision/system_reseal.sh"
       ],
       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"

diff --git a/packer/templates/devstack.json b/packer/templates/devstack.json
index 18fdfd0e6683e524569e2c45cfbcce517c2b0540..e3fe2b4ac294dd5d4bd88722025371d90d6e1572 100644 (file)
--- a/packer/templates/devstack.json
+++ b/packer/templates/devstack.json
@@ -60,6 +60,7 @@
       "scripts": [
         "provision/baseline.sh",
         "provision/devstack.sh",
+        "provision/system_reseal_local_env.sh",
         "provision/system_reseal.sh"
       ],
       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"

diff --git a/packer/templates/docker.json b/packer/templates/docker.json
index c7ff21543f07ea3936e0e0bcd1e836eba3ca90c4..5c19c97b60879650d3b0598d6a1ad97dfea1d2ff 100644 (file)
--- a/packer/templates/docker.json
+++ b/packer/templates/docker.json
@@ -60,6 +60,7 @@
       "scripts": [
         "provision/baseline.sh",
         "provision/docker.sh",
+        "provision/system_reseal_local_env.sh",
         "provision/system_reseal.sh"
       ],
       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"

diff --git a/packer/templates/gbp.json b/packer/templates/gbp.json
index 52d420adddb1824d059f39efbf1599648c236d27..d3816b6ba57edc7e1ea25cd98cefcec8efef82b5 100644 (file)
--- a/packer/templates/gbp.json
+++ b/packer/templates/gbp.json
@@ -69,6 +69,7 @@
       "scripts": [
         "provision/baseline.sh",
         "provision/gbp.sh",
+        "provision/system_reseal_local_env.sh",
         "provision/system_reseal.sh"
       ],
       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"

diff --git a/packer/templates/java-builder.json b/packer/templates/java-builder.json
index f742592a546ed14d9835de450c29c121ad9a257f..30c38b4d6603ef713bba5787a6cd32327620f903 100644 (file)
--- a/packer/templates/java-builder.json
+++ b/packer/templates/java-builder.json
@@ -60,6 +60,7 @@
       "scripts": [
         "provision/baseline.sh",
         "provision/java-builder.sh",
+        "provision/system_reseal_local_env.sh",
         "provision/system_reseal.sh"
       ],
       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"

diff --git a/packer/templates/mininet-ovs-2.3.json b/packer/templates/mininet-ovs-2.3.json
index 3579437abce9889da6541b5c81896a0625806014..49f29527a243f526256063d97841eb1d0a03dcf2 100644 (file)
--- a/packer/templates/mininet-ovs-2.3.json
+++ b/packer/templates/mininet-ovs-2.3.json
@@ -60,6 +60,7 @@
       "scripts": [
         "provision/baseline.sh",
         "provision/mininet-ovs-2.3.sh",
+        "provision/system_reseal_local_env.sh",
         "provision/system_reseal.sh"
       ],
       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"

diff --git a/packer/templates/mininet-ovs-2.5.json b/packer/templates/mininet-ovs-2.5.json
index fc172a673da00a8e8ad0883419a60fcf86d15e34..02f83807d251e49470b9fb55ae7042efadc65e42 100644 (file)
--- a/packer/templates/mininet-ovs-2.5.json
+++ b/packer/templates/mininet-ovs-2.5.json
@@ -60,6 +60,7 @@
       "scripts": [
         "provision/baseline.sh",
         "provision/mininet-ovs-2.5.sh",
+        "provision/system_reseal_local_env.sh",
         "provision/system_reseal.sh"
       ],
       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"

diff --git a/packer/templates/mininet.json b/packer/templates/mininet.json
index 180975b7519a6921142c2ade68eafdb38700c891..1bb33619b2d5552f0e61952bee3a4b8b9b5ebf07 100644 (file)
--- a/packer/templates/mininet.json
+++ b/packer/templates/mininet.json
@@ -60,6 +60,7 @@
       "scripts": [
         "provision/baseline.sh",
         "provision/mininet.sh",
+        "provision/system_reseal_local_env.sh",
         "provision/system_reseal.sh"
       ],
       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"

diff --git a/packer/templates/robot.json b/packer/templates/robot.json
index a20eefbdcaf51fafba252c157b4714fb5d505b2f..790a482a9ebe13d0a09a75c429b1ad196a63f7d3 100644 (file)
--- a/packer/templates/robot.json
+++ b/packer/templates/robot.json
@@ -60,6 +60,7 @@
       "scripts": [
         "provision/baseline.sh",
         "provision/robot.sh",
+        "provision/system_reseal_local_env.sh",
         "provision/system_reseal.sh"
       ],
       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"