diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-01-22 04:21:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-01-22 04:21:37 +0000 |
| commit | 01fe17fe1ba0f5d43d14890dc3b7fc0150f67ac8 (patch) | |
| tree | 85698f58bae6dd4038cad2d200fde44b672609b8 | |
| parent | 5569d09be2b1197b3b0a4fea7f8ce197231ee6e7 (diff) | |
| parent | e5d4ce3c5f1ff04e1d0910508fa3cf101893d3e6 (diff) | |
Merge "Add SSL configuration metadata for overclouds."
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | ssl-source.yaml | 43 |
2 files changed, 45 insertions, 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 diff --git a/ssl-source.yaml b/ssl-source.yaml new file mode 100644 index 00000000..9127555a --- /dev/null +++ b/ssl-source.yaml @@ -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 |