Heat makes a bad instance name for cluster node

[Yaroslav Lobankov]

For example, I want to create cluster with name "test-cluster" and Savanna uses Heat as infrastructure engine. In this case names of instances look like "test-cluster-test-cluster-<name of node group>-<number of instance in node group>-<id>". Names of instances should have the following type: "test-cluster-<name of node group>-<number of instance in node group>-<id>".

Heat template looks like:
 "test-cluster-worker-node-dn-1": {
      "Type": "OS::Nova::Server",
      "Properties": {
        "key_name": "ylobankov",
        "flavor": "22",
        "user_data": {
          "Fn::Join": [
            "\n",
            [
              "#!/bin/bash",
              "echo \"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2iEn7durRDs381Y4l6QVYdMp1nkSNqA1IzTvfzn7qXDdWg43S8mHHay4DBClaTrc56UenfpxTu1yPqIDv+xzq0DA/Mt/YVRq/h7S+YJA0gsx2N3+Oa1rx4IzwHDhQTC2/J5Fo1ATkewulyQ6aVtuY6LKx+oTVzJYLIBLhKWgFcpqReC1w7QR3xVXjO+OkBficXbnE/HUMFnyyZsPagEOjoRmJ70n74uLAIzERIt41GuHXQ7zY68+octfqAbnYVm4neo4xQWGP6iJqpatP6gMhsb1GBCnvyBQU1SJzUzq2mL6bp+T6enVf6sxnWt//9Ee5iqbcA2dAsdlqHrOj20ar Generated by Savanna",
              "\" >> /home/ec2-user/.ssh/authorized_keys"
            ]
          ]
        },
        "image": "a68e5adb-1f07-46e7-a483-4184a0b4753c",
        "networks": [
          {
            "port": {
              "Ref": "test-cluster-worker-node-dn-1"
            }
          }
        ]
      }
    }

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/66558

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/66558
Committed: https://git.openstack.org/cgit/openstack/savanna/commit/?id=f514d22a5630a7d14cab4c811b54212282e1a49a
Submitter: Jenkins
Branch: master

commit f514d22a5630a7d14cab4c811b54212282e1a49a
Author: Alexander Ignatov <email address hidden>
Date: Tue Jan 14 17:13:21 2014 +0400

    Fixed wrong instance name with Heat engine

    * Added 'name' fields for OS:Nova:Server resources in Heat template
    * Now instance names has 03d suffixes as it is in the old savanna engine

    Change-Id: I6675f8e9bb613f9df22f7bc061b2fa821479719f
    Closes-Bug: #1267454