From 4d80570860bd3753af0095d5f037e6ed9f06cea8 Mon Sep 17 00:00:00 2001 From: Sebastian Marcet Date: Tue, 18 Aug 2015 17:51:39 -0300 Subject: [PATCH] Updated OpenStackId configuration added following config variables: id_recaptcha_public_key id_recaptcha_private_key app_url app_key Change-Id: I8362d6721b16b442ea974d282d82f506e809bbe0 --- manifests/site.pp | 62 +++++++++++-------- .../manifests/openstackid_dev.pp | 6 +- .../manifests/openstackid_prod.pp | 4 ++ 3 files changed, 44 insertions(+), 28 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index a6d5bf4884..8f8eb74c7f 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -880,20 +880,24 @@ node 'release.slave.openstack.org' { # Node-OS: trusty node 'openstackid.org' { class { 'openstack_project::openstackid_prod': - sysadmins => hiera('sysadmins', []), - site_admin_password => hiera('openstackid_site_admin_password'), - id_mysql_host => hiera('openstackid_id_mysql_host', 'localhost'), - id_mysql_password => hiera('openstackid_id_mysql_password'), - id_mysql_user => hiera('openstackid_id_mysql_user', 'username'), - id_db_name => hiera('openstackid_id_db_name'), - ss_mysql_host => hiera('openstackid_ss_mysql_host', 'localhost'), - ss_mysql_password => hiera('openstackid_ss_mysql_password'), - ss_mysql_user => hiera('openstackid_ss_mysql_user', 'username'), - ss_db_name => hiera('openstackid_ss_db_name', 'username'), - redis_password => hiera('openstackid_redis_password'), - ssl_cert_file_contents => hiera('openstackid_ssl_cert_file_contents'), - ssl_key_file_contents => hiera('openstackid_ssl_key_file_contents'), - ssl_chain_file_contents => hiera('openstackid_ssl_chain_file_contents'), + sysadmins => hiera('sysadmins', []), + site_admin_password => hiera('openstackid_site_admin_password'), + id_mysql_host => hiera('openstackid_id_mysql_host', 'localhost'), + id_mysql_password => hiera('openstackid_id_mysql_password'), + id_mysql_user => hiera('openstackid_id_mysql_user', 'username'), + id_db_name => hiera('openstackid_id_db_name'), + ss_mysql_host => hiera('openstackid_ss_mysql_host', 'localhost'), + ss_mysql_password => hiera('openstackid_ss_mysql_password'), + ss_mysql_user => hiera('openstackid_ss_mysql_user', 'username'), + ss_db_name => hiera('openstackid_ss_db_name', 'username'), + redis_password => hiera('openstackid_redis_password'), + ssl_cert_file_contents => hiera('openstackid_ssl_cert_file_contents'), + ssl_key_file_contents => hiera('openstackid_ssl_key_file_contents'), + ssl_chain_file_contents => hiera('openstackid_ssl_chain_file_contents'), + id_recaptcha_public_key => hiera('openstackid_recaptcha_public_key'), + id_recaptcha_private_key => hiera('openstackid_recaptcha_private_key'), + app_url => 'https://openstackid.org', + app_key => hiera('openstackid_app_key'), } } @@ -901,19 +905,23 @@ node 'openstackid.org' { # Node-OS: trusty node 'openstackid-dev.openstack.org' { class { 'openstack_project::openstackid_dev': - sysadmins => hiera('sysadmins', []), - site_admin_password => hiera('openstackid_dev_site_admin_password'), - id_mysql_host => hiera('openstackid_dev_id_mysql_host', 'localhost'), - id_mysql_password => hiera('openstackid_dev_id_mysql_password'), - id_mysql_user => hiera('openstackid_dev_id_mysql_user', 'username'), - ss_mysql_host => hiera('openstackid_dev_ss_mysql_host', 'localhost'), - ss_mysql_password => hiera('openstackid_dev_ss_mysql_password'), - ss_mysql_user => hiera('openstackid_dev_ss_mysql_user', 'username'), - ss_db_name => hiera('openstackid_dev_ss_db_name', 'username'), - redis_password => hiera('openstackid_dev_redis_password'), - ssl_cert_file_contents => hiera('openstackid_dev_ssl_cert_file_contents'), - ssl_key_file_contents => hiera('openstackid_dev_ssl_key_file_contents'), - ssl_chain_file_contents => hiera('openstackid_dev_ssl_chain_file_contents'), + sysadmins => hiera('sysadmins', []), + site_admin_password => hiera('openstackid_dev_site_admin_password'), + id_mysql_host => hiera('openstackid_dev_id_mysql_host', 'localhost'), + id_mysql_password => hiera('openstackid_dev_id_mysql_password'), + id_mysql_user => hiera('openstackid_dev_id_mysql_user', 'username'), + ss_mysql_host => hiera('openstackid_dev_ss_mysql_host', 'localhost'), + ss_mysql_password => hiera('openstackid_dev_ss_mysql_password'), + ss_mysql_user => hiera('openstackid_dev_ss_mysql_user', 'username'), + ss_db_name => hiera('openstackid_dev_ss_db_name', 'username'), + redis_password => hiera('openstackid_dev_redis_password'), + ssl_cert_file_contents => hiera('openstackid_dev_ssl_cert_file_contents'), + ssl_key_file_contents => hiera('openstackid_dev_ssl_key_file_contents'), + ssl_chain_file_contents => hiera('openstackid_dev_ssl_chain_file_contents'), + id_recaptcha_public_key => hiera('openstackid_dev_recaptcha_public_key'), + id_recaptcha_private_key => hiera('openstackid_dev_recaptcha_private_key'), + app_url => 'https://openstackid-dev.openstack.org', + app_key => hiera('openstackid_dev_app_key'), } } diff --git a/modules/openstack_project/manifests/openstackid_dev.pp b/modules/openstack_project/manifests/openstackid_dev.pp index 6ec6dd4b08..cfdae8ce82 100644 --- a/modules/openstack_project/manifests/openstackid_dev.pp +++ b/modules/openstack_project/manifests/openstackid_dev.pp @@ -37,7 +37,9 @@ class openstack_project::openstackid_dev ( $id_environment = 'dev', $ssl_cert_file_contents = '', $ssl_key_file_contents = '', - $ssl_chain_file_contents = '' + $ssl_chain_file_contents = '', + $app_url = '', + $app_key = '', ) { realize ( @@ -75,6 +77,8 @@ class openstack_project::openstackid_dev ( ssl_cert_file_contents => $ssl_cert_file_contents, ssl_key_file_contents => $ssl_key_file_contents, ssl_chain_file_contents => $ssl_chain_file_contents, + app_url => $app_url, + app_key => $app_key, } # redis (custom module written by tipit) diff --git a/modules/openstack_project/manifests/openstackid_prod.pp b/modules/openstack_project/manifests/openstackid_prod.pp index 608654a550..2cded170fb 100644 --- a/modules/openstack_project/manifests/openstackid_prod.pp +++ b/modules/openstack_project/manifests/openstackid_prod.pp @@ -39,6 +39,8 @@ class openstack_project::openstackid_prod ( $ssl_key_file_contents = '', $ssl_chain_file_contents = '', $release = '1.0.7', + $app_url = '', + $app_key = '', ) { class { 'openstack_project::server': @@ -72,6 +74,8 @@ class openstack_project::openstackid_prod ( ssl_key_file_contents => $ssl_key_file_contents, ssl_chain_file_contents => $ssl_chain_file_contents, openstackid_release => $release, + app_url => $app_url, + app_key => $app_key, } # redis (custom module written by tipit)