From a9b131346b02d8c6e2a50fdc0a1b9d79ef87e871 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Wed, 18 Apr 2018 20:44:04 +0000 Subject: [PATCH] Override the default_url for StoryBoard servers In order to provide useful URLs in E-mail notifications, set the default_url for the openstack_project::storyboard class. Change-Id: I70cc33e73b3cff6855270d46e1dd40940221b0d1 Depends-On: https://review.openstack.org/555237 --- manifests/site.pp | 2 ++ modules/openstack_project/manifests/storyboard.pp | 2 ++ modules/openstack_project/manifests/storyboard/dev.pp | 2 ++ 3 files changed, 6 insertions(+) diff --git a/manifests/site.pp b/manifests/site.pp index e037208335..642ad2912e 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -792,6 +792,7 @@ node /^storyboard\d*\.openstack\.org$/ { 'http://logs.openstack.org', ], sender_email_address => 'storyboard@storyboard.openstack.org', + default_url => 'https://storyboard.openstack.org', } } @@ -817,6 +818,7 @@ node /^storyboard-dev\d*\.openstack\.org$/ { 'http://logs.openstack.org', ], sender_email_address => 'storyboard-dev@storyboard-dev.openstack.org', + default_url => 'https://storyboard-dev.openstack.org', } } diff --git a/modules/openstack_project/manifests/storyboard.pp b/modules/openstack_project/manifests/storyboard.pp index f2b19800e8..702a417d5b 100644 --- a/modules/openstack_project/manifests/storyboard.pp +++ b/modules/openstack_project/manifests/storyboard.pp @@ -20,6 +20,7 @@ class openstack_project::storyboard( $valid_oauth_clients = [$::fqdn], $cors_allowed_origins = ["https://${::fqdn}"], $sender_email_address = undef, + $default_url = undef, ) { class { 'project_config': @@ -100,6 +101,7 @@ class openstack_project::storyboard( rabbitmq_user => $rabbitmq_user, rabbitmq_user_password => $rabbitmq_password, sender_email_address => $sender_email_address, + default_url => $default_url, } class { '::storyboard::rabbit': diff --git a/modules/openstack_project/manifests/storyboard/dev.pp b/modules/openstack_project/manifests/storyboard/dev.pp index 006413e68c..b616f2493d 100644 --- a/modules/openstack_project/manifests/storyboard/dev.pp +++ b/modules/openstack_project/manifests/storyboard/dev.pp @@ -16,6 +16,7 @@ class openstack_project::storyboard::dev( $valid_oauth_clients = [$::fqdn], $cors_allowed_origins = ["https://${::fqdn}"], $sender_email_address = undef, + $default_url = undef, ) { class { 'openstack_project::storyboard': @@ -35,6 +36,7 @@ class openstack_project::storyboard::dev( valid_oauth_clients => $valid_oauth_clients, cors_allowed_origins => $cors_allowed_origins, sender_email_address => $sender_email_address, + default_url => $default_url, } realize (