From b802d5f4a0488065c77089bb5e4e39f899f113ef Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Thu, 9 Jul 2015 16:39:34 -0400 Subject: [PATCH] Fix variable access warnings Change-Id: If5d0b9945c90d00967414d9dd745ce8dbeb6f3b6 Signed-off-by: Paul Belanger --- templates/database.php.erb | 22 +++++++++++----------- templates/environment.php.erb | 2 +- templates/log.php.erb | 4 ++-- templates/recaptcha.php.erb | 6 +++--- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/templates/database.php.erb b/templates/database.php.erb index e358bc2..4ab097c 100644 --- a/templates/database.php.erb +++ b/templates/database.php.erb @@ -41,10 +41,10 @@ return array( //primary DB 'openstackid' => array( 'driver' => 'mysql', - 'host' => '<%= id_mysql_host %>', - 'database' => '<%= id_db_name %>', - 'username' => '<%= id_mysql_user %>', - 'password' => '<%= id_mysql_password %>', + 'host' => '<%= @id_mysql_host %>', + 'database' => '<%= @id_db_name %>', + 'username' => '<%= @id_mysql_user %>', + 'password' => '<%= @id_mysql_password %>', 'charset' => 'utf8', 'collation' => 'utf8_unicode_ci', 'prefix' => '', @@ -52,10 +52,10 @@ return array( //secondary DB (OS Membership) 'os_members' => array( 'driver' => 'mysql', - 'host' => '<%= ss_mysql_host %>', - 'database' => '<%= ss_db_name %>', - 'username' => '<%= ss_mysql_user %>', - 'password' => '<%= ss_mysql_password %>', + 'host' => '<%= @ss_mysql_host %>', + 'database' => '<%= @ss_db_name %>', + 'username' => '<%= @ss_mysql_user %>', + 'password' => '<%= @ss_mysql_password %>', 'charset' => 'utf8', 'collation' => 'utf8_unicode_ci', 'prefix' => '', @@ -85,10 +85,10 @@ return array( 'redis' => array( 'cluster' => false, 'default' => array( - 'host' => '<%= redis_host %>', - 'port' => <%= redis_port %>, + 'host' => '<%= @redis_host %>', + 'port' => <%= @redis_port %>, 'database' => 0, - 'password' => '<%= redis_password %>' + 'password' => '<%= @redis_password %>' ), ), ); diff --git a/templates/environment.php.erb b/templates/environment.php.erb index e3353e2..000bc79 100644 --- a/templates/environment.php.erb +++ b/templates/environment.php.erb @@ -1,6 +1,6 @@ detectEnvironment(array( - '<%= id_environment %>' => array('<%= id_hostname %>') + '<%= @id_environment %>' => array('<%= @id_hostname %>') )); diff --git a/templates/log.php.erb b/templates/log.php.erb index 90f952c..46824b0 100644 --- a/templates/log.php.erb +++ b/templates/log.php.erb @@ -4,7 +4,7 @@ return array( * EMAIL ERROR LOG CONFIGURATION */ //The receiver of the mail - 'to_email' => '<%= id_log_error_to_email %>', + 'to_email' => '<%= @id_log_error_to_email %>', //The sender of the mail - 'from_email' => '<%= id_log_error_from_email %>' + 'from_email' => '<%= @id_log_error_from_email %>' ); diff --git a/templates/recaptcha.php.erb b/templates/recaptcha.php.erb index d706ad8..1773c8e 100644 --- a/templates/recaptcha.php.erb +++ b/templates/recaptcha.php.erb @@ -8,8 +8,8 @@ return array( | Set the public and private API keys as provided by reCAPTCHA. | */ - 'public_key' => '<%= id_recaptcha_public_key %>', - 'private_key' => '<%= id_recaptcha_private_key %>', + 'public_key' => '<%= @id_recaptcha_public_key %>', + 'private_key' => '<%= @id_recaptcha_private_key %>', /* |-------------------------------------------------------------------------- | Template @@ -18,5 +18,5 @@ return array( | Set a template to use if you don't want to use the standard one. | */ - 'template' => '<%= id_recaptcha_template %>' + 'template' => '<%= @id_recaptcha_template %>' );