From: Nicholas Randon <nicholas.randon@hp.com>
Date: Thu, 13 Nov 2014 09:18:34 +0000 (+0000)
Subject: Provide a single stunnel connect_host
X-Git-Tag: opnfv-6.0.0~2724
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=8b17c4939dfb71e423f87adf2556290aee7da7f3;p=apex-tripleo-heat-templates.git

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
---

diff --git a/ssl-source.yaml b/ssl-source.yaml
index a03aac37..a9357323 100644
--- a/ssl-source.yaml
+++ b/ssl-source.yaml
@@ -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