Revert "Update Pin RS centos7 image"

This reverts commit 4c7af3e90bfbae8faedb5b302eeaa3cf0f254ed0.

A new version of nova-agent is release which fixes this issue.

Jira: RELENG-118
Change-Id: Ic738cf77236434aa84b2c6c32bb4ce9f324cfeab
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/packer/templates/devstack-pre-pip-newton.json b/packer/templates/devstack-pre-pip-newton.json
index 5de50fcb9e7923f4d70bdf84c22c0f74776b095f..74f89faa9e105d5869d13323a91d568b0bec9fa1 100644 (file)
--- a/packer/templates/devstack-pre-pip-newton.json
+++ b/packer/templates/devstack-pre-pip-newton.json
@@ -28,7 +28,7 @@
       "region": "DFW",
       "ssh_username": "{{user `public_cloud_user`}}",
       "image_name": "{{user `distro`}} - devstack-newton - {{isotime \"20060102-1504\"}}",
-      "source_image": "{{user `public_base_image`}}",
+      "source_image_name": "{{user `public_base_image`}}",
       "flavor": "general1-1",
       "networks": [
         "{{user `public_network`}}"

diff --git a/packer/templates/devstack.json b/packer/templates/devstack.json
index 1234aa531393adf95364504b1d06ad36a73ca9fb..dc38a548161e94a697b0782e89b644d30d303538 100644 (file)
--- a/packer/templates/devstack.json
+++ b/packer/templates/devstack.json
@@ -28,7 +28,7 @@
       "region": "DFW",
       "ssh_username": "{{user `public_cloud_user`}}",
       "image_name": "{{user `distro`}} - devstack - {{isotime \"20060102-1504\"}}",
-      "source_image": "{{user `public_base_image`}}",
+      "source_image_name": "{{user `public_base_image`}}",
       "flavor": "general1-1",
       "networks": [
         "{{user `public_network`}}"

diff --git a/packer/templates/java-builder.json b/packer/templates/java-builder.json
index adae8a1c473a6a3834aaf2edabfe62150a70d42e..ef5f42e0453e3340c13f34d243b58b8d76583eca 100644 (file)
--- a/packer/templates/java-builder.json
+++ b/packer/templates/java-builder.json
@@ -28,7 +28,7 @@
       "region": "DFW",
       "ssh_username": "{{user `public_cloud_user`}}",
       "image_name": "{{user `distro`}} - java-builder - {{isotime \"20060102-1504\"}}",
-      "source_image": "{{user `public_base_image`}}",
+      "source_image_name": "{{user `public_base_image`}}",
       "flavor": "general1-1",
       "networks": [
         "{{user `public_network`}}"

diff --git a/packer/templates/robot.json b/packer/templates/robot.json
index e361c805764785cfeb5dd9fd377ebb5a325f495a..d79322dc390ce544198122b1fa1fcf5b2641f428 100644 (file)
--- a/packer/templates/robot.json
+++ b/packer/templates/robot.json
@@ -28,7 +28,7 @@
       "region": "DFW",
       "ssh_username": "{{user `public_cloud_user`}}",
       "image_name": "{{user `distro`}} - robot - {{isotime \"20060102-1504\"}}",
-      "source_image": "{{user `public_base_image`}}",
+      "source_image_name": "{{user `public_base_image`}}",
       "flavor": "general1-1",
       "networks": [
         "{{user `public_network`}}"