Merge "Add SSL configuration metadata for overclouds."

This commit is contained in:
Jenkins 2014-01-22 04:21:37 +00:00 committed by Gerrit Code Review
commit 01fe17fe1b
2 changed files with 45 additions and 2 deletions

@ -10,8 +10,8 @@ overcloud_source_deps = nova-compute-instance.yaml
all: $(generated_templates)
overcloud.yaml: overcloud-source.yaml swift-source.yaml $(overcloud_source_deps)
python ./tripleo_heat_merge/merge.py overcloud-source.yaml swift-source.yaml > $@.tmp
overcloud.yaml: overcloud-source.yaml swift-source.yaml ssl-source.yaml $(overcloud_source_deps)
python ./tripleo_heat_merge/merge.py overcloud-source.yaml swift-source.yaml ssl-source.yaml > $@.tmp
mv $@.tmp $@
overcloud-with-block-storage.yaml: overcloud-source.yaml nova-compute-instance.yaml swift-source.yaml block-storage.yaml

43
ssl-source.yaml Normal file

@ -0,0 +1,43 @@
Description: 'ssl-source: SSL endpoint metadata for openstack'
Parameters:
SSLCertificate:
Default: ''
Description: If set, the contents of an SSL certificate .crt file for encrypting SSL endpoints.
Type: String
NoEcho: true
SSLKey:
Default: ''
Description: If set, the contents of an SSL certificate .key file for encrypting SSL endpoints.
Type: String
NoEcho: true
Resources:
notcomputeConfig:
Type: AWS::AutoScaling::LaunchConfiguration
Metadata:
stunnel:
cert:
Ref: SSLCertificate
key:
Ref: SSLKey
ports:
- name: 'ec2'
accept: 13773
connect: 8773
- name: 'image'
accept: 13292
connect: 9292
- name: 'identity'
accept: 13000
connect: 5000
- name: 'network'
accept: 13696
connect: 9696
- name: 'compute'
accept: 13774
connect: 8774
- name: 'swift-proxy'
accept: 13080
connect: 8080
- name: 'cinder'
accept: 13776
connect: 8776