From 628b7cce511a21914cde7514947ec96a7f38f303 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Sun, 20 Jan 2019 18:06:21 +0000
Subject: [PATCH] Prepare for storyboard server replacement
Like recently done with storyboard-dev, switch storyboard to a host
group and use an explicit vhost name so that the site can be
divorced from the hostname of the instance providing it.
Change-Id: Iacb91cb6f22dee239bd51347d17c10a7bcb01a33
---
manifests/site.pp | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/manifests/site.pp b/manifests/site.pp
index 7c802d618e..fdad6b8f9e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -560,6 +560,7 @@ node /^refstack\d*\.open.*\.org$/ {
# Node-OS: trusty
# Node-OS: xenial
node /^storyboard\d*\.open.*\.org$/ {
+ $group = "storyboard"
class { 'openstack_project::storyboard':
project_config_repo => 'https://git.openstack.org/openstack-infra/project-config',
mysql_host => hiera('storyboard_db_host', 'localhost'),
@@ -572,13 +573,13 @@ node /^storyboard\d*\.open.*\.org$/ {
ssl_key => '/etc/ssl/private/storyboard.openstack.org.key',
ssl_key_file_contents => hiera('storyboard_ssl_key_file_contents'),
ssl_chain_file_contents => hiera('storyboard_ssl_chain_file_contents'),
- hostname => $::fqdn,
+ hostname => 'storyboard.openstack.org',
valid_oauth_clients => [
- $::fqdn,
+ 'storyboard.openstack.org',
'logs.openstack.org',
],
cors_allowed_origins => [
- "https://${::fqdn}",
+ 'https://storyboard.openstack.org',
'http://logs.openstack.org',
],
sender_email_address => 'storyboard@storyboard.openstack.org',