From 237fe384e2a33468a5dff289f49c011350fa8d5e Mon Sep 17 00:00:00 2001
From: Marton Kiss <marton.kiss@gmail.com>
Date: Wed, 29 Oct 2014 09:32:43 +0100
Subject: [PATCH] Add groups portal openid url
Move the openid provider url into groups_openid_provider configuration
variable for groups portal. We are separating the productive and
staging urls, so productive is pointing to openstackid.org now.
Change-Id: Ifc7d5d41b80c3a080800d1d9d1ef394490d93b14
---
modules/drupal/manifests/init.pp | 1 +
modules/drupal/templates/settings.php.erb | 3 +++
modules/openstack_project/manifests/groups.pp | 1 +
modules/openstack_project/manifests/groups_dev.pp | 1 +
4 files changed, 6 insertions(+)
diff --git a/modules/drupal/manifests/init.pp b/modules/drupal/manifests/init.pp
index 75f5160a99..a08144527b 100644
--- a/modules/drupal/manifests/init.pp
+++ b/modules/drupal/manifests/init.pp
@@ -71,6 +71,7 @@ class drupal (
$conf_cron_key = undef,
$conf_markdown_directory = undef,
$conf_ga_account = undef,
+ $conf_openid_provider = undef,
) {
include apache
include pear
diff --git a/modules/drupal/templates/settings.php.erb b/modules/drupal/templates/settings.php.erb
index cea23f7aaf..aca2be9348 100644
--- a/modules/drupal/templates/settings.php.erb
+++ b/modules/drupal/templates/settings.php.erb
@@ -14,4 +14,7 @@ $conf['groups_feeds_markdown_directory'] = '<%= @conf_markdown_directory %>';
<% end %>
<% if @conf_ga_account %>
$conf['googleanalytics_account'] = '<%= @conf_ga_account %>';
+<% end %>
+<% if @conf_openid_provider %>
+$conf['groups_openid_provider'] = '<%= @conf_openid_provider %>';
<% end %>
\ No newline at end of file
diff --git a/modules/openstack_project/manifests/groups.pp b/modules/openstack_project/manifests/groups.pp
index 7495af968c..45fe647c5a 100644
--- a/modules/openstack_project/manifests/groups.pp
+++ b/modules/openstack_project/manifests/groups.pp
@@ -55,6 +55,7 @@ class openstack_project::groups (
conf_cron_key => $conf_cron_key,
conf_markdown_directory => '/srv/groups-static-pages',
conf_ga_account => 'UA-17511903-1',
+ conf_openid_provider => 'https://openstackid.org',
require => [ Class['openstack_project::server'],
Vcsrepo['/srv/groups-static-pages'] ],
}
diff --git a/modules/openstack_project/manifests/groups_dev.pp b/modules/openstack_project/manifests/groups_dev.pp
index 05b0963acd..4ecfc4c420 100644
--- a/modules/openstack_project/manifests/groups_dev.pp
+++ b/modules/openstack_project/manifests/groups_dev.pp
@@ -56,6 +56,7 @@ class openstack_project::groups_dev (
package_branch => 'dev',
conf_cron_key => $conf_cron_key,
conf_markdown_directory => '/srv/groups-static-pages',
+ conf_openid_provider => 'https://openstackid-dev.openstack.org',
require => [ Class['openstack_project::server'],
Vcsrepo['/srv/groups-static-pages'] ]
}