openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Provide a single stunnel connect_host 

At present connect_host is specified by each port, individually, as
the same value. Move connect_host to be a direct child of the stunnel
element so it is only specified once.

Although previously we could theoretically specify a different
connect_host for each service, in practice they were the same and
that never would have worked.

This change means Mustache like {{#stunnel.connect_host}} will work.

Change-Id: I25c4bb09cf28a3728e959d4dd583af26a602ad90
Partial-Bug: #1391926
This commit is contained in:
Nicholas Randon 2014-11-13 09:18:34 +00:00
parent 9b2446c88d
commit 8b17c4939d
1 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ssl-source.yaml
View File

@ -21,53 +21,34 @@ resources:
group: os-apply-config
config:
ssl:
ca_certificate:
get_input: ssl_ca_certificate
ca_certificate: {get_input: ssl_ca_certificate}
stunnel:
cert:
get_input: ssl_certificate
key:
get_input: ssl_key
cacert:
get_input: ssl_ca_certificate
cert: {get_input: ssl_certificate}
key: {get_input: ssl_key}
cacert: {get_input: ssl_ca_certificate}
connect_host: {get_input: controller_host}
ports:
- name: 'ec2'
accept: 13773
connect: 8773
connect_host:
get_input: controller_host
- name: 'image'
accept: 13292
connect: 9292
connect_host:
get_input: controller_host
- name: 'identity'
accept: 13000
connect: 5000
connect_host:
get_input: controller_host
- name: 'network'
accept: 13696
connect: 9696
connect_host:
get_input: controller_host
- name: 'compute'
accept: 13774
connect: 8774
connect_host:
get_input: controller_host
- name: 'swift-proxy'
accept: 13080
connect: 8080
connect_host:
get_input: controller_host
- name: 'cinder'
accept: 13776
connect: 8776
connect_host:
get_input: controller_host
- name: 'ceilometer'
accept: 13777
connect: 8777
connect_host:
get_input: controller_host