From a6f349f2cbda039437bf35c1d0d7fd5d27092d3f Mon Sep 17 00:00:00 2001 From: Marton Kiss Date: Tue, 3 Feb 2015 14:26:54 +0100 Subject: [PATCH] Move Drupal settings to conf variable This change is using the new conf variable to set settings.php variables instead of separate conf_xxx ones. It helps to extended the configuration without puppet-drupal module rewrite. Depends-On: I9e77d609bc6aaa3a5e10f065e79aa8a86cae151e Change-Id: I991a121d081ee54800fb2988a040fddce0e0db48 --- modules/openstack_project/manifests/groups.pp | 10 ++++++---- modules/openstack_project/manifests/groups_dev.pp | 8 +++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/modules/openstack_project/manifests/groups.pp b/modules/openstack_project/manifests/groups.pp index a12238eaa8..72d905e86a 100644 --- a/modules/openstack_project/manifests/groups.pp +++ b/modules/openstack_project/manifests/groups.pp @@ -65,10 +65,12 @@ class openstack_project::groups ( site_ssl_chain_file => $site_ssl_chain_file, package_repository => 'http://tarballs.openstack.org/groups/drupal-updates/release-history', package_branch => 'stable', - 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', + conf => { + 'cron_key' => $conf_cron_key, + 'groups_feeds_markdown_directory' => '/srv/groups-static-pages', + 'googleanalytics_account' => 'UA-17511903-1', + 'groups_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 8d8d166c10..4b0d205f66 100644 --- a/modules/openstack_project/manifests/groups_dev.pp +++ b/modules/openstack_project/manifests/groups_dev.pp @@ -63,9 +63,11 @@ class openstack_project::groups_dev ( site_ssl_key_file => $site_ssl_key_file, package_repository => 'http://tarballs.openstack.org/groups/drupal-updates/release-history', package_branch => 'dev', - conf_cron_key => $conf_cron_key, - conf_markdown_directory => '/srv/groups-static-pages', - conf_openid_provider => 'https://openstackid-dev.openstack.org', + conf => { + 'cron_key' => $conf_cron_key, + 'groups_feeds_markdown_directory' => '/srv/groups-static-pages', + 'groups_openid_provider' => 'https://openstackid.org' + }, require => [ Class['openstack_project::server'], Vcsrepo['/srv/groups-static-pages'] ] }