diff options
author | 2013-08-14 17:56:48 -0700 | |
---|---|---|
committer | 2013-08-14 20:25:14 -0700 | |
commit | c7241b26e5356c1cedeb687d5066d5822c146777 (patch) | |
tree | 435de8d491c700b810c02edd2b2488528e40dc32 /nova-compute-instance.yaml | |
parent | 2334a8f0b2526aace63c74a7f58a5a8060d29487 (diff) |
Make Resource names suitable for merge/include
In nova-compute-instance.yaml, we need to use resource names that are
unique within the entire set of resources that may be merged or
included. However, we need the instance resource name to _match_ the
one in overcloud-source.yaml so that its own access policies can
function.
Without this change we will not have unique users and Metadata access
keys/policies for compute and controller.
Change-Id: Iebde7e6adede4984f4f693cf2d57b6fadb8be558
Diffstat (limited to 'nova-compute-instance.yaml')
-rw-r--r-- | nova-compute-instance.yaml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index be15e724..0da26e65 100644 --- a/nova-compute-instance.yaml +++ b/nova-compute-instance.yaml @@ -49,20 +49,20 @@ Parameters: NeutronEnableTunnelling: Type: String Resources: - AccessPolicy: + ComputeAccessPolicy: Type: OS::Heat::AccessPolicy Properties: - AllowedResources: [ NovaCompute ] - User: + AllowedResources: [ NovaCompute0 ] + ComputeUser: Type: AWS::IAM::User Properties: - Policies: [ { Ref: AccessPolicy } ] - Key: + Policies: [ { Ref: ComputeAccessPolicy } ] + ComputeKey: Type: AWS::IAM::AccessKey Properties: UserName: - Ref: User - NovaCompute: + Ref: ComputeUser + NovaCompute0: Type: AWS::EC2::Instance Properties: ImageId: @@ -73,14 +73,14 @@ Resources: OpenStack::ImageBuilder::Elements: [ nova-compute ] heat: access_key_id: - Ref: Key + Ref: ComputeKey secret_key: - Fn::GetAtt: [ Key, SecretAccessKey ] + Fn::GetAtt: [ ComputeKey, SecretAccessKey ] stack: name: {Ref: 'AWS::StackName'} region: {Ref: 'AWS::Region'} refresh: - - resource: NovaCompute + - resource: NovaCompute0 nova: compute_driver: {Ref: NovaComputeDriver} compute_libvirt_type: {Ref: NovaComputeLibvirtType} |