Merge "Add groups portal openid url"

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

modules/drupal/templates/settings.php.erb

@@ -15,3 +15,6 @@ $conf['groups_feeds_markdown_directory'] = '<%= @conf_markdown_directory %>';
 <% if @conf_ga_account %>
 $conf['googleanalytics_account'] = '<%= @conf_ga_account %>';
 <% end %>
+<% if @conf_openid_provider %>
+$conf['groups_openid_provider'] = '<%= @conf_openid_provider %>';
+<% end %>

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'] ],
   }

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'] ]
   }