From be5af1a35e6bbb9e517fd953a5fe0e2467676b91 Mon Sep 17 00:00:00 2001
From: Clint Byrum <clint@fewbar.com>
Date: Wed, 19 Mar 2014 15:16:32 -0700
Subject: Switch overcloud to software-config

This migrates the overcloud to using OS::Heat::StructuredConfig and
OS::Heat::StructuredDeployment. With those tools, we can decouple
servers from software configuration and begin to deprecate features in
tripleo_heat_merge.

Change-Id: Ice85f0711e90d0fabf1d1bc4698201c4d6758508
---
 ssl-source.yaml | 61 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 31 insertions(+), 30 deletions(-)

(limited to 'ssl-source.yaml')

diff --git a/ssl-source.yaml b/ssl-source.yaml
index 14b0eb11..26f2f72c 100644
--- a/ssl-source.yaml
+++ b/ssl-source.yaml
@@ -11,33 +11,34 @@ Parameters:
     Type: String
     NoEcho: true
 Resources:
-  controller0Config:
-    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
+  SSLConfig:
+    Type: OS::Heat::StructuredConfig
+    Properties:
+      config:
+        stunnel:
+          cert:
+            get_input: ssl_certificate
+          key:
+            get_input: ssl_key
+          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
-- 
cgit 1.2.3-korg