From c3c465ba2188af13a1d18075d51c81abc3d19495 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Fri, 7 Nov 2014 15:29:46 +0000
Subject: storyboard: Various changes towards getting to work

Main obstacle now seems to be the lack of systemd in the default Docker
container setup.
---
 baserock_storyboard/packer_template.json |  7 ++++---
 baserock_storyboard/puppet-storyboard    |  2 +-
 baserock_storyboard/site.pp              | 24 ++++++++++++++++++++----
 3 files changed, 25 insertions(+), 8 deletions(-)

(limited to 'baserock_storyboard')

diff --git a/baserock_storyboard/packer_template.json b/baserock_storyboard/packer_template.json
index 95ef0d9f..b5be4c9d 100644
--- a/baserock_storyboard/packer_template.json
+++ b/baserock_storyboard/packer_template.json
@@ -14,17 +14,18 @@
                 "yum install -y ruby gem",
                 "gem install puppet"
             ]
-        }
+        },
         {   "type": "shell",
             "inline": [
                 "cd /src/test-baserock-infrastructure/baserock_storyboard",
                 "puppet module build puppet-storyboard",
-                "puppet module install --no-dependencies puppet-storyboard/pkg/openstack-storyboard-*.*.*.tar.gz"
+                "puppet module install puppet-storyboard/pkg/openstack-storyboard-*.*.*.tar.gz",
+                "puppet module install camptocamp-openssl"
             ]
         },
         {
             "type": "puppet-masterless",
-            "manifests_file": "site.pp"
+            "manifest_file": "baserock_storyboard/site.pp"
         }
     ],
     "post-processors": [
diff --git a/baserock_storyboard/puppet-storyboard b/baserock_storyboard/puppet-storyboard
index 3a5c3825..a5cfbdad 160000
--- a/baserock_storyboard/puppet-storyboard
+++ b/baserock_storyboard/puppet-storyboard
@@ -1 +1 @@
-Subproject commit 3a5c3825b84a17e827dc837fff575913d5b9a1cd
+Subproject commit a5cfbdad0e9b31da40aecd50bdfbef9e3beac6c4
diff --git a/baserock_storyboard/site.pp b/baserock_storyboard/site.pp
index cc5fd458..c91d5d5c 100644
--- a/baserock_storyboard/site.pp
+++ b/baserock_storyboard/site.pp
@@ -1,6 +1,22 @@
 node default {
-    class { 'storyboard':
-        mysql_user_password => 'insecure',
-        rabbitmq_user_password => 'insecure'
-    }
+  group { 'ssl-cert':
+    ensure => 'present'
+  }
+
+  # TEMPORARY SSL private key
+  openssl::certificate::x509 { 'storyboard_dummy':
+    country => 'UK',
+    organization => 'The Baserock Project',
+    commonname => 'baserock.org',
+    base_dir => '/etc/ssl',
+    password => 'insecure'
+  } ->
+
+  class { 'storyboard':
+    mysql_user_password => 'insecure',
+    rabbitmq_user_password => 'insecure',
+    ssl_cert_file => '/etc/ssl/certs/storyboard_dummy.crt',
+    ssl_key_file => '/etc/ssl/certs/storyboard_dummy.key',
+    require => Group['ssl-cert']
+  }
 }
-- 
cgit v1.2.1