Merge "Remove the tuskar-source template"

[apex-tripleo-heat-templates.git] / ssl-source.yaml

diff --git a/ssl-source.yaml b/ssl-source.yaml
index 26f2f72..38d6d7e 100644 (file)
--- a/ssl-source.yaml
+++ b/ssl-source.yaml
@@ -10,16 +10,23 @@ Parameters:
     Description: If set, the contents of an SSL certificate .key file for encrypting SSL endpoints.
     Type: String
     NoEcho: true
+  SSLCACertificate:
+    Default: ''
+    Description: If set, the contents of an SSL certificate authority file.
+    Type: String
 Resources:
   SSLConfig:
     Type: OS::Heat::StructuredConfig
     Properties:
+      group: os-apply-config
       config:
         stunnel:
           cert:
             get_input: ssl_certificate
           key:
             get_input: ssl_key
+          cacert:
+            get_input: ssl_ca_certificate
           ports:
            - name: 'ec2'
              accept: 13773
@@ -42,3 +49,6 @@ Resources:
            - name: 'cinder'
              accept: 13776
              connect: 8776
+           - name: 'ceilometer'
+             accept: 13777
+             connect: 8777