Rename image name format to suit Heat implementation

Heat template scripts require the format <distro> - <name> - <date-stamp>
since the Heat template derives the name from the mid section of our
image names. Having multiple words between hypens in the name causes scripting
issues.

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

diff --git a/packer/templates/devstack-pre-pip-mitaka.json b/packer/templates/devstack-pre-pip-mitaka.json
index a6de66f724dd60070c0866443f8a41b54213cbb5..3676ae31bf723ac0443fe68d5930e1efa2d8ba1f 100644 (file)
--- a/packer/templates/devstack-pre-pip-mitaka.json
+++ b/packer/templates/devstack-pre-pip-mitaka.json
@@ -29,7 +29,7 @@
       "password": "{{user `public_pass`}}",
       "region": "DFW",
       "ssh_username": "{{user `public_cloud_user`}}",
-      "image_name": "{{user `distro`}} - devstack - mitaka - {{isotime \"20060102-1504\"}}",
+      "image_name": "{{user `distro`}} - devstack-mitaka - {{isotime \"20060102-1504\"}}",
       "source_image_name": "{{user `public_base_image`}}",
       "flavor": "general1-1",
       "networks": [
@@ -45,7 +45,7 @@
       "username": "{{user `private_user`}}",
       "password": "{{user `private_pass`}}",
       "ssh_username": "{{user `private_cloud_user`}}",
-      "image_name": "{{user `distro`}} - devstack - mitaka - {{isotime \"20060102-1504\"}}",
+      "image_name": "{{user `distro`}} - devstack-mitaka - {{isotime \"20060102-1504\"}}",
       "source_image_name": "{{user `private_base_image`}}",
       "flavor": "general1-1",
       "networks": [

diff --git a/packer/templates/devstack-pre-pip-newton.json b/packer/templates/devstack-pre-pip-newton.json
index a97d82644e838cfe7a56b58909702c11e946612d..99e5fe7bf091f6563b84b68f618fbbde1d445d90 100644 (file)
--- a/packer/templates/devstack-pre-pip-newton.json
+++ b/packer/templates/devstack-pre-pip-newton.json
@@ -29,7 +29,7 @@
       "password": "{{user `public_pass`}}",
       "region": "DFW",
       "ssh_username": "{{user `public_cloud_user`}}",
-      "image_name": "{{user `distro`}} - devstack - newton - {{isotime \"20060102-1504\"}}",
+      "image_name": "{{user `distro`}} - devstack-newton - {{isotime \"20060102-1504\"}}",
       "source_image_name": "{{user `public_base_image`}}",
       "flavor": "general1-1",
       "networks": [
@@ -45,7 +45,7 @@
       "username": "{{user `private_user`}}",
       "password": "{{user `private_pass`}}",
       "ssh_username": "{{user `private_cloud_user`}}",
-      "image_name": "{{user `distro`}} - devstack - newton - {{isotime \"20060102-1504\"}}",
+      "image_name": "{{user `distro`}} - devstack-newton - {{isotime \"20060102-1504\"}}",
       "source_image_name": "{{user `private_base_image`}}",
       "flavor": "general1-1",
       "networks": [