diff options
author | 2014-03-19 15:16:32 -0700 | |
---|---|---|
committer | 2014-04-16 14:10:48 +1200 | |
commit | be5af1a35e6bbb9e517fd953a5fe0e2467676b91 (patch) | |
tree | 021e451d33e64007e9fae34d273d652709cc6aaf /swift-storage-source.yaml | |
parent | a830cea3b1071f70485f427877ac4577f5d13e16 (diff) |
Switch overcloud to software-config
This migrates the overcloud to using OS::Heat::StructuredConfig and
OS::Heat::StructuredDeployment. With those tools, we can decouple
servers from software configuration and begin to deprecate features in
tripleo_heat_merge.
Change-Id: Ice85f0711e90d0fabf1d1bc4698201c4d6758508
Diffstat (limited to 'swift-storage-source.yaml')
-rw-r--r-- | swift-storage-source.yaml | 111 |
1 files changed, 20 insertions, 91 deletions
diff --git a/swift-storage-source.yaml b/swift-storage-source.yaml index 93011e70..69236b28 100644 --- a/swift-storage-source.yaml +++ b/swift-storage-source.yaml @@ -15,30 +15,6 @@ Parameters: Type: String Default: True Resources: - SwiftStorageAccessPolicy: - Type: OS::Heat::AccessPolicy - Properties: - AllowedResources: - - SwiftStorage0 - - SwiftStorage0Config - SwiftStorageUser: - Type: AWS::IAM::User - Properties: - Policies: [ { Ref: SwiftStorageAccessPolicy } ] - SwiftStorage0Key: - Type: AWS::IAM::AccessKey - Properties: - UserName: - Ref: SwiftStorageUser - SwiftStorage0CompletionCondition: - Type: AWS::CloudFormation::WaitCondition - DependsOn: controller0Config - Properties: - Handle: {Ref: SwiftStorage0CompletionHandle} - Count: '1' - Timeout: '1800' - SwiftStorage0CompletionHandle: - Type: AWS::CloudFormation::WaitConditionHandle SwiftStorage0: Type: OS::Nova::Server Properties: @@ -46,80 +22,33 @@ Resources: {Ref: SwiftStorageImage} flavor: {Ref: OvercloudSwiftStorageFlavor} key_name: {Ref: KeyName} - Metadata: - os-collect-config: - cfn: - access_key_id: - Ref: SwiftStorage0Key - secret_access_key: - Fn::GetAtt: [ SwiftStorage0Key, SecretAccessKey ] - stack_name: {Ref: 'AWS::StackName'} - path: SwiftStorage0Config.Metadata - OpenStack::ImageBuilder::Elements: [ swift ] - SwiftStorage0Config: - Type: AWS::AutoScaling::LaunchConfiguration + SwiftStorage0Deploy: + Type: OS::Heat::StructuredDeployment Properties: - InstanceType: '0' - ImageId: '0' - Metadata: - completion-handle: - Ref: SwiftStorage0CompletionHandle - os-collect-config: - cfn: - access_key_id: - Ref: SwiftStorage0Key - secret_access_key: - Fn::GetAtt: [ SwiftStorage0Key, SecretAccessKey ] - stack_name: {Ref: 'AWS::StackName'} - path: SwiftStorage0Config.Metadata - admin-password: {Ref: AdminPassword} - neutron: - ovs: - local_ip: - Fn::Select: - - 0 - - Fn::Select: - - ctlplane - - Fn::GetAtt: - - SwiftStorage0 - - networks - tenant_network_type: {Ref: NeutronNetworkType} - enable_tunneling: {Ref: NeutronEnableTunnelling} - service-password: - Ref: NeutronPassword - swift: - devices: + server: {Ref: SwiftStorage0} + config: {Ref: SwiftConfig} + input_values: + neutron_local_ip: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [SwiftStorage0, networks]} ]} ] } + swift_devices: Fn::Join: - ', ' - - Fn::Join: - '' - - 'r1z1-' - - Fn::Select: - - 0 - - Fn::Select: - - 'ctlplane' - - Fn::GetAtt: - - controller0 - - networks + - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] } - ':%PORT%/d1' - Fn::Join: - ', ' - - Merge::Map: - SwiftStorage0: - Fn::Join: - - '' - - - 'r1z1-' + Merge::Map: + SwiftStorage0: + Fn::Join: + - '' + - - 'r1z1-' + - Fn::Select: + - 0 - Fn::Select: - - 0 - - Fn::Select: - - 'ctlplane' - - Fn::GetAtt: - - SwiftStorage0 - - networks - - ':%PORT%/d1' - hash: - Ref: SwiftHashSuffix - part-power: 10 - replicas: 1 - service-password: - Ref: SwiftPassword + - 'ctlplane' + - Fn::GetAtt: + - SwiftStorage0 + - networks + - ':%PORT%/d1' |