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:
parent
9b2446c88d
commit
8b17c4939d
|
@ -21,53 +21,34 @@ resources:
|
||||||
group: os-apply-config
|
group: os-apply-config
|
||||||
config:
|
config:
|
||||||
ssl:
|
ssl:
|
||||||
ca_certificate:
|
ca_certificate: {get_input: ssl_ca_certificate}
|
||||||
get_input: ssl_ca_certificate
|
|
||||||
stunnel:
|
stunnel:
|
||||||
cert:
|
cert: {get_input: ssl_certificate}
|
||||||
get_input: ssl_certificate
|
key: {get_input: ssl_key}
|
||||||
key:
|
cacert: {get_input: ssl_ca_certificate}
|
||||||
get_input: ssl_key
|
connect_host: {get_input: controller_host}
|
||||||
cacert:
|
|
||||||
get_input: ssl_ca_certificate
|
|
||||||
ports:
|
ports:
|
||||||
- name: 'ec2'
|
- name: 'ec2'
|
||||||
accept: 13773
|
accept: 13773
|
||||||
connect: 8773
|
connect: 8773
|
||||||
connect_host:
|
|
||||||
get_input: controller_host
|
|
||||||
- name: 'image'
|
- name: 'image'
|
||||||
accept: 13292
|
accept: 13292
|
||||||
connect: 9292
|
connect: 9292
|
||||||
connect_host:
|
|
||||||
get_input: controller_host
|
|
||||||
- name: 'identity'
|
- name: 'identity'
|
||||||
accept: 13000
|
accept: 13000
|
||||||
connect: 5000
|
connect: 5000
|
||||||
connect_host:
|
|
||||||
get_input: controller_host
|
|
||||||
- name: 'network'
|
- name: 'network'
|
||||||
accept: 13696
|
accept: 13696
|
||||||
connect: 9696
|
connect: 9696
|
||||||
connect_host:
|
|
||||||
get_input: controller_host
|
|
||||||
- name: 'compute'
|
- name: 'compute'
|
||||||
accept: 13774
|
accept: 13774
|
||||||
connect: 8774
|
connect: 8774
|
||||||
connect_host:
|
|
||||||
get_input: controller_host
|
|
||||||
- name: 'swift-proxy'
|
- name: 'swift-proxy'
|
||||||
accept: 13080
|
accept: 13080
|
||||||
connect: 8080
|
connect: 8080
|
||||||
connect_host:
|
|
||||||
get_input: controller_host
|
|
||||||
- name: 'cinder'
|
- name: 'cinder'
|
||||||
accept: 13776
|
accept: 13776
|
||||||
connect: 8776
|
connect: 8776
|
||||||
connect_host:
|
|
||||||
get_input: controller_host
|
|
||||||
- name: 'ceilometer'
|
- name: 'ceilometer'
|
||||||
accept: 13777
|
accept: 13777
|
||||||
connect: 8777
|
connect: 8777
|
||||||
connect_host:
|
|
||||||
get_input: controller_host
|
|
||||||
|
|
Loading…
Reference in New Issue