summaryrefslogtreecommitdiffstats
path: root/block-storage-nfs.yaml
diff options
context:
space:
mode:
authorSteve Baker <sbaker@redhat.com>2014-08-04 08:43:34 +1200
committerSteve Baker <sbaker@redhat.com>2014-08-04 08:57:52 +1200
commitbeca15dec5265783047d5df210b270ed3d77dd4b (patch)
treeae0f9d59cc80f1794e8e31c8d150daad11987371 /block-storage-nfs.yaml
parent9413fb3098254fb8cbeb5d4951aba474b8755afb (diff)
Port all templates to HOT
This change was generated and validated by running the following: make hot clean all validate-all This converts all templates to be valid HOT. Fn::Select is not converted in this change but this will actually work with heat_template_version 2013-05-23. Fn::Select is converted manually in the next change in this series. This change also sets the heat_template_version to 2014-10-16 which includes the list_join intrinsic functions used throughout these templates. Partial-Blueprint: tripleo-juno-remove-mergepy Change-Id: Ib3cbb83f6ae94adb7b793ab1b662bd5c55cbb5b3
Diffstat (limited to 'block-storage-nfs.yaml')
-rw-r--r--block-storage-nfs.yaml82
1 files changed, 41 insertions, 41 deletions
diff --git a/block-storage-nfs.yaml b/block-storage-nfs.yaml
index 93ac4f65..9583576f 100644
--- a/block-storage-nfs.yaml
+++ b/block-storage-nfs.yaml
@@ -1,68 +1,68 @@
-HeatTemplateFormatVersion: '2012-12-12'
-Description: 'Common Block Storage Configuration'
-Parameters:
+heat_template_version: 2014-10-16
+description: 'Common Block Storage Configuration'
+parameters:
BlockStorageImage:
- Type: String
- Default: overcloud-cinder-volume
+ type: string
+ default: overcloud-cinder-volume
OvercloudBlockStorageFlavor:
- Default: baremetal
- Description: Flavor for block storage nodes to request when deploying.
- Type: String
-Resources:
+ default: baremetal
+ description: Flavor for block storage nodes to request when deploying.
+ type: string
+resources:
BlockStorageAccessPolicy:
- Type: OS::Heat::AccessPolicy
- Properties:
+ type: OS::Heat::AccessPolicy
+ properties:
AllowedResources:
- BlockStorage0
BlockStorageUser:
- Type: AWS::IAM::User
- Properties:
- Policies: [ { Ref: BlockStorageAccessPolicy } ]
+ type: AWS::IAM::User
+ properties:
+ Policies: [ { get_resource: BlockStorageAccessPolicy } ]
BlockStorageKey:
- Type: AWS::IAM::AccessKey
- Properties:
+ type: AWS::IAM::AccessKey
+ properties:
UserName:
- Ref: BlockStorageUser
+ get_resource: BlockStorageUser
BlockStorage0CompletionCondition:
- Type: AWS::CloudFormation::WaitCondition
- DependsOn: controller0Config
- Properties:
- Handle: {Ref: BlockStorage0CompletionHandle}
+ type: AWS::CloudFormation::WaitCondition
+ depends_on: controller0Config
+ properties:
+ Handle: {get_resource: BlockStorage0CompletionHandle}
Count: '1'
Timeout: '1800'
BlockStorage0CompletionHandle:
- Type: AWS::CloudFormation::WaitConditionHandle
+ type: AWS::CloudFormation::WaitConditionHandle
BlockStorage0:
- Type: OS::Nova::Server
- Properties:
+ type: OS::Nova::Server
+ properties:
image:
- {Ref: BlockStorageImage}
- flavor: {Ref: OvercloudBlockStorageFlavor}
- key_name: {Ref: KeyName}
- Metadata:
+ {get_param: BlockStorageImage}
+ flavor: {get_param: OvercloudBlockStorageFlavor}
+ key_name: {get_param: KeyName}
+ metadata:
completion-handle:
- Ref: BlockStorage0CompletionHandle
+ get_resource: BlockStorage0CompletionHandle
os-collect-config:
cfn:
access_key_id:
- Ref: BlockStorageKey
+ get_resource: BlockStorageKey
secret_access_key:
- Fn::GetAtt: [ BlockStorageKey, SecretAccessKey ]
- stack_name: {Ref: 'AWS::StackName'}
+ get_attr: [ BlockStorageKey, SecretAccessKey ]
+ stack_name: {get_param: 'AWS::StackName'}
keystone:
- host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] }
+ host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {get_attr: [controller0, networks]} ]} ] }
cinder:
- db: {"Fn::Join": ['', ['mysql://cinder:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] } , '/cinder']]}
+ db: {list_join: ['', ['mysql://cinder:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {get_attr: [controller0, networks]} ]} ] } , '/cinder']]}
volume_size_mb: '5000'
service-password:
- Ref: CinderPassword
+ get_param: CinderPassword
include_nfs_backend: 'true'
nfs_shares:
- - {"Fn::Join": ['', [{"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] } , ':/mnt/state/var/lib/nfs_share']]}
- admin-password: {Ref: AdminPassword}
+ - {list_join: ['', [{"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {get_attr: [controller0, networks]} ]} ] } , ':/mnt/state/var/lib/nfs_share']]}
+ admin-password: {get_param: AdminPassword}
rabbit:
- host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] }
- username: {Ref: RabbitUserName}
- password: {Ref: RabbitPassword}
+ host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {get_attr: [controller0, networks]} ]} ] }
+ username: {get_param: RabbitUserName}
+ password: {get_param: RabbitPassword}
interfaces:
- control: {Ref: NeutronPublicInterface}
+ control: {get_param: NeutronPublicInterface}