diff options
| -rw-r--r-- | block-storage.yaml | 47 | ||||
| -rw-r--r-- | nova-compute-instance.yaml | 2 | ||||
| -rw-r--r-- | overcloud-source.yaml | 8 | ||||
| -rw-r--r-- | swift-storage-source.yaml | 4 | ||||
| -rw-r--r-- | undercloud-source.yaml | 2 |
5 files changed, 56 insertions, 7 deletions
diff --git a/block-storage.yaml b/block-storage.yaml index 453a0ac7..312ce95b 100644 --- a/block-storage.yaml +++ b/block-storage.yaml @@ -8,17 +8,24 @@ Parameters: Default: baremetal Description: Flavor for block storage nodes to request when deploying. Type: String + NeutronNetworkType: + Type: String + Default: 'gre' + NeutronEnableTunnelling: + Type: String + Default: True Resources: BlockStorageAccessPolicy: Type: OS::Heat::AccessPolicy Properties: AllowedResources: - BlockStorage0 + - BlockStorage0Config BlockStorageUser: Type: AWS::IAM::User Properties: Policies: [ { Ref: BlockStorageAccessPolicy } ] - BlockStorageKey: + BlockStorage0Key: Type: AWS::IAM::AccessKey Properties: UserName: @@ -40,16 +47,32 @@ Resources: flavor: {Ref: OvercloudBlockStorageFlavor} key_name: {Ref: KeyName} Metadata: + os-collect-config: + cfn: + access_key_id: + Ref: BlockStorage0Key + secret_access_key: + Fn::GetAtt: [ BlockStorage0Key, SecretAccessKey ] + stack_name: {Ref: 'AWS::StackName'} + path: BlockStorage0Config.Metadata + OpenStack::ImageBuilder::Elements: [ cinder ] + BlockStorage0Config: + Type: AWS::AutoScaling::LaunchConfiguration + Properties: + InstanceType: '0' + ImageId: '0' + Metadata: completion-handle: Ref: BlockStorage0CompletionHandle os-collect-config: cfn: access_key_id: - Ref: BlockStorageKey + Ref: BlockStorage0Key secret_access_key: - Fn::GetAtt: [ BlockStorageKey, SecretAccessKey ] + Fn::GetAtt: [ BlockStorage0Key, SecretAccessKey ] stack_name: {Ref: 'AWS::StackName'} - OpenStack::ImageBuilder::Elements: [ cinder ] + path: BlockStorage0Config.Metadata + admin-password: {Ref: AdminPassword} keystone: host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] } cinder: @@ -57,6 +80,8 @@ Resources: volume_size_mb: '5000' service-password: Ref: CinderPassword + iscsi-helper: + Ref: CinderISCSIHelper admin-password: {Ref: AdminPassword} rabbit: host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] } @@ -64,3 +89,17 @@ Resources: password: {Ref: RabbitPassword} interfaces: control: {Ref: NeutronPublicInterface} + neutron: + ovs: + local_ip: + Fn::Select: + - 0 + - Fn::Select: + - ctlplane + - Fn::GetAtt: + - BlockStorage0 + - networks + tenant_network_type: {Ref: NeutronNetworkType} + enable_tunneling: {Ref: NeutronEnableTunnelling} + service-password: + Ref: NeutronPassword diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index 81217362..92e9a019 100644 --- a/nova-compute-instance.yaml +++ b/nova-compute-instance.yaml @@ -15,7 +15,7 @@ Parameters: Type: String Default: baremetal ImageUpdatePolicy: - Default: 'REPLACE' + Default: 'REBUILD_PRESERVE_EPHEMERAL' Description: What policy to use when reconstructing instances. REBUILD for rebuilds, REBUILD_PRESERVE_EPHEMERAL to preserve /mnt. Type: String NovaImage: diff --git a/overcloud-source.yaml b/overcloud-source.yaml index a7098227..6b7be9ad 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -17,6 +17,10 @@ Parameters: Description: The password for the cinder service account, used by cinder-api. Type: String NoEcho: true + CinderISCSIHelper: + Default: tgtadm + Description: The iSCSI helper to use with cinder. + Type: String OvercloudControlFlavor: Default: baremetal Description: Flavor for control nodes to request when deploying. @@ -44,7 +48,7 @@ Parameters: Type: String NoEcho: true ImageUpdatePolicy: - Default: 'REPLACE' + Default: 'REBUILD_PRESERVE_EPHEMERAL' Description: What policy to use when reconstructing instances. REBUILD for rebuilds, REBUILD_PRESERVE_EPHEMERAL to preserve /mnt. Type: String KeyName: @@ -318,6 +322,8 @@ Resources: volume_size_mb: '5000' service-password: Ref: CinderPassword + iscsi-helper: + Ref: CinderISCSIHelper completion-handle: Ref: notCompute0CompletionHandle controller-address: diff --git a/swift-storage-source.yaml b/swift-storage-source.yaml index 92e11e61..16f2f36c 100644 --- a/swift-storage-source.yaml +++ b/swift-storage-source.yaml @@ -11,6 +11,9 @@ Parameters: NeutronNetworkType: Type: String Default: 'gre' + NeutronEnableTunnelling: + Type: String + Default: True Resources: SwiftStorageAccessPolicy: Type: OS::Heat::AccessPolicy @@ -81,6 +84,7 @@ Resources: - SwiftStorage0 - networks tenant_network_type: {Ref: NeutronNetworkType} + enable_tunneling: {Ref: NeutronEnableTunnelling} service-password: Ref: NeutronPassword swift: diff --git a/undercloud-source.yaml b/undercloud-source.yaml index 2bf927f8..39cc4252 100644 --- a/undercloud-source.yaml +++ b/undercloud-source.yaml @@ -42,7 +42,7 @@ Parameters: Type: String NoEcho: true ImageUpdatePolicy: - Default: REPLACE + Default: REBUILD_PRESERVE_EPHEMERAL Description: What policy to use when reconstructing instances. REBUILD for rebuilds, REBUILD_PRESERVE_EPHEMERAL to preserve /mnt. Type: String |