Browse Source

Merge "Add optional cinder storage node to overcloud"

changes/06/67806/1
Jenkins 8 years ago
committed by Gerrit Code Review
parent
commit
6200c9f484
  1. 6
      Makefile
  2. 66
      block-storage.yaml

6
Makefile

@ -14,6 +14,12 @@ overcloud.yaml: overcloud-source.yaml swift-source.yaml $(overcloud_source_deps)
python ./tripleo_heat_merge/merge.py overcloud-source.yaml swift-source.yaml > $@.tmp
mv $@.tmp $@
overcloud-with-block-storage.yaml: overcloud-source.yaml nova-compute-instance.yaml swift-source.yaml block-storage.yaml
# $^ won't work here because we want to list nova-compute-instance.yaml as
# a prerequisite but don't want to pass it into merge.py
python ./tripleo_heat_merge/merge.py overcloud-source.yaml swift-source.yaml block-storage.yaml > $@.tmp
mv $@.tmp $@
undercloud-vm.yaml: undercloud-source.yaml undercloud-vm-source.yaml
python ./tripleo_heat_merge/merge.py $^ > $@.tmp
mv $@.tmp $@

66
block-storage.yaml

@ -0,0 +1,66 @@
HeatTemplateFormatVersion: '2012-12-12'
Description: 'Common Block Storage Configuration'
Parameters:
BlockStorageImage:
Type: String
Default: overcloud-cinder-volume
KeystoneHost:
Type: String
Default: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notcompute, networks]} ]} ] }
MySQLHost:
Type: String
Default: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notcompute, networks]} ]} ] }
RabbitHost:
Type: String
Default: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notcompute, networks]} ]} ] }
RabbitPassword:
Type: String
Default: "guest"
NoEcho: true
Resources:
BlockStorageAccessPolicy:
Type: OS::Heat::AccessPolicy
Properties:
AllowedResources:
- BlockStorage0
BlockStorageUser:
Type: AWS::IAM::User
Properties:
Policies: [ { Ref: BlockStorageAccessPolicy } ]
BlockStorageKey:
Type: AWS::IAM::AccessKey
Properties:
UserName:
Ref: BlockStorageUser
BlockStorage0:
Type: OS::Nova::Server
Properties:
image:
{Ref: BlockStorageImage}
flavor: {Ref: Flavor}
key_name: {Ref: KeyName}
InstanceType: '0'
ImageId: '0'
Metadata:
os-collect-config:
cfn:
access_key_id:
Ref: BlockStorageKey
secret_access_key:
Fn::GetAtt: [ BlockStorageKey, SecretAccessKey ]
stack_name: {Ref: 'AWS::StackName'}
OpenStack::ImageBuilder::Elements: [ cinder ]
keystone:
host: {Ref: KeystoneHost}
cinder:
db: {"Fn::Join": ['', ['mysql://cinder:unset@', {Ref: MySQLHost}, '/cinder']]}
volume_size_mb: '5000'
service-password:
Ref: CinderPassword
volume: 'true'
admin-password: {Ref: AdminPassword}
rabbit:
host: {Ref: RabbitHost}
password: {Ref: RabbitPassword}
interfaces:
control: {Ref: NeutronPublicInterface}
Loading…
Cancel
Save