opendev/puppet-openstackid
Code Issues Proposed changes

Fix variable access warnings

Browse Source 
Change-Id: If5d0b9945c90d00967414d9dd745ce8dbeb6f3b6
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger
2015-07-09 16:39:34 -04:00
parent dd44e9c1e6
commit b802d5f4a0
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
templates/database.php.erb
View File

@@ -41,10 +41,10 @@ return array(
//primary DB //primary DB
'openstackid' => array( 'openstackid' => array(
'driver' => 'mysql', 'driver' => 'mysql',
'host' => '<%= id_mysql_host %>', 'host' => '<%= @id_mysql_host %>',
'database' => '<%= id_db_name %>', 'database' => '<%= @id_db_name %>',
'username' => '<%= id_mysql_user %>', 'username' => '<%= @id_mysql_user %>',
'password' => '<%= id_mysql_password %>', 'password' => '<%= @id_mysql_password %>',
'charset' => 'utf8', 'charset' => 'utf8',
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
@@ -52,10 +52,10 @@ return array(
//secondary DB (OS Membership) //secondary DB (OS Membership)
'os_members' => array( 'os_members' => array(
'driver' => 'mysql', 'driver' => 'mysql',
'host' => '<%= ss_mysql_host %>', 'host' => '<%= @ss_mysql_host %>',
'database' => '<%= ss_db_name %>', 'database' => '<%= @ss_db_name %>',
'username' => '<%= ss_mysql_user %>', 'username' => '<%= @ss_mysql_user %>',
'password' => '<%= ss_mysql_password %>', 'password' => '<%= @ss_mysql_password %>',
'charset' => 'utf8', 'charset' => 'utf8',
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
@@ -85,10 +85,10 @@ return array(
'redis' => array( 'redis' => array(
'cluster' => false, 'cluster' => false,
'default' => array( 'default' => array(
'host' => '<%= redis_host %>', 'host' => '<%= @redis_host %>',
'port' => <%= redis_port %>, 'port' => <%= @redis_port %>,
'database' => 0, 'database' => 0,
'password' => '<%= redis_password %>' 'password' => '<%= @redis_password %>'
), ),
), ),
); );

2
templates/environment.php.erb
View File

@@ -1,6 +1,6 @@
<?php <?php
$env = $app->detectEnvironment(array( $env = $app->detectEnvironment(array(
'<%= id_environment %>' => array('<%= id_hostname %>') '<%= @id_environment %>' => array('<%= @id_hostname %>')
)); ));

4
templates/log.php.erb
View File

@@ -4,7 +4,7 @@ return array(
* EMAIL ERROR LOG CONFIGURATION * EMAIL ERROR LOG CONFIGURATION
*/ */
//The receiver of the mail //The receiver of the mail
'to_email' => '<%= id_log_error_to_email %>', 'to_email' => '<%= @id_log_error_to_email %>',
//The sender of the mail //The sender of the mail
'from_email' => '<%= id_log_error_from_email %>' 'from_email' => '<%= @id_log_error_from_email %>'
); );

6
templates/recaptcha.php.erb
View File

@@ -8,8 +8,8 @@ return array(
| Set the public and private API keys as provided by reCAPTCHA. | Set the public and private API keys as provided by reCAPTCHA.
| |
*/ */
'public_key' => '<%= id_recaptcha_public_key %>', 'public_key' => '<%= @id_recaptcha_public_key %>',
'private_key' => '<%= id_recaptcha_private_key %>', 'private_key' => '<%= @id_recaptcha_private_key %>',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Template | Template
@@ -18,5 +18,5 @@ return array(
| Set a template to use if you don't want to use the standard one. | Set a template to use if you don't want to use the standard one.
| |
*/ */
'template' => '<%= id_recaptcha_template %>' 'template' => '<%= @id_recaptcha_template %>'
); );