From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 20 Dec 2016 20:24:22 +0000 (+0000)
Subject: Merge "Use OS::Heat::DeployedServer"
X-Git-Tag: opnfv-6.0.0~1310
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=724670088954dd76c0fedcbae91cc58826ba0e0d;p=apex-tripleo-heat-templates.git

Merge "Use OS::Heat::DeployedServer"
---

724670088954dd76c0fedcbae91cc58826ba0e0d
diff --cc deployed-server/deployed-server.yaml
index 73b71588,10e934d1..3ba7abac
--- a/deployed-server/deployed-server.yaml
+++ b/deployed-server/deployed-server.yaml
@@@ -51,9 -49,9 +49,9 @@@ resources
    InstanceIdConfig:
      type: OS::Heat::StructuredConfig
      properties:
 -      group: os-apply-config
 +      group: apply-config
        config:
-         instance-id: {get_attr: [deployed-server, "OS::stack_id"]}
+         instance-id: {get_resource: deployed-server}
  
    InstanceIdDeployment:
      type: OS::Heat::StructuredDeployment