[MediaWiki-commits] [Gerrit] openstack-database-server: enclose variables - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/179452

Change subject: openstack-database-server: enclose variables
......................................................................

openstack-database-server: enclose variables

fixes some more "variable not enclosed in {}"

Change-Id: Ic1617de53c7278d1245ecd478f9a07be34b70a90
---
M modules/openstack/manifests/database-server.pp
1 file changed, 8 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/52/179452/1

diff --git a/modules/openstack/manifests/database-server.pp 
b/modules/openstack/manifests/database-server.pp
index 9ec4208..27f0896 100644
--- a/modules/openstack/manifests/database-server.pp
+++ b/modules/openstack/manifests/database-server.pp
@@ -39,8 +39,8 @@
             command => '/usr/bin/mysql -uroot < /etc/nova/nova-user.sql',
             require => [Class['mysql'], File['/etc/nova/nova-user.sql', 
'/etc/nova/nova-user.cnf', '/root/.my.cnf']];
         'create_nova_db':
-            unless  => "/usr/bin/mysql --defaults-file=/root/.my.cnf -uroot 
$nova_db_name -e 'exit'",
-            command => "/usr/bin/mysql --defaults-file=/root/.my.cnf -uroot -e 
\"create database $nova_db_name;\"",
+            unless  => "/usr/bin/mysql --defaults-file=/root/.my.cnf -uroot 
${nova_db_name} -e 'exit'",
+            command => "/usr/bin/mysql --defaults-file=/root/.my.cnf -uroot -e 
\"create database ${nova_db_name};\"",
             require => [Class['mysql'], File['/root/.my.cnf']],
             before  => Exec['create_nova_db_user'];
         'create_puppet_db_user':
@@ -48,8 +48,8 @@
             command => '/usr/bin/mysql -uroot < /etc/puppet/puppet-user.sql',
             require => [Class['mysql'], File['/etc/puppet/puppet-user.sql', 
'/etc/puppet/puppet-user.cnf', '/root/.my.cnf']];
         'create_puppet_db':
-            unless  => "/usr/bin/mysql --defaults-file=/root/.my.cnf -uroot 
$puppet_db_name -e 'exit'",
-            command => "/usr/bin/mysql --defaults-file=/root/.my.cnf -uroot -e 
\"create database $puppet_db_name;\"",
+            unless  => "/usr/bin/mysql --defaults-file=/root/.my.cnf -uroot 
${puppet_db_name} -e 'exit'",
+            command => "/usr/bin/mysql --defaults-file=/root/.my.cnf -uroot -e 
\"create database ${puppet_db_name};\"",
             require => [Class['mysql'], File['/root/.my.cnf']],
             before  => Exec['create_puppet_db_user'];
         'create_glance_db_user':
@@ -57,8 +57,8 @@
             command => '/usr/bin/mysql -uroot < /etc/glance/glance-user.sql',
             require => [Class['mysql'], 
File['/etc/glance/glance-user.sql','/etc/glance/glance-user.cnf','/root/.my.cnf']];
         'create_glance_db':
-            unless  => "/usr/bin/mysql --defaults-file=/root/.my.cnf -uroot 
$glance_db_name -e 'exit'",
-            command => "/usr/bin/mysql --defaults-file=/root/.my.cnf -uroot -e 
\"create database $glance_db_name;\"",
+            unless  => "/usr/bin/mysql --defaults-file=/root/.my.cnf -uroot 
${glance_db_name} -e 'exit'",
+            command => "/usr/bin/mysql --defaults-file=/root/.my.cnf -uroot -e 
\"create database ${glance_db_name};\"",
             require => [Class['mysql'], File['/root/.my.cnf']],
             before  => Exec['create_glance_db_user'];
     }
@@ -69,8 +69,8 @@
             command => '/usr/bin/mysql -uroot < 
/etc/keystone/keystone-user.sql',
             require => [Class['mysql'], 
File['/etc/keystone/keystone-user.sql', '/etc/keystone/keystone-user.cnf', 
'/root/.my.cnf']];
         'create_keystone_db':
-            unless  => "/usr/bin/mysql --defaults-file=/root/.my.cnf -uroot 
$keystone_db_name -e 'exit'",
-            command => "/usr/bin/mysql --defaults-file=/root/.my.cnf -uroot -e 
\"create database $keystone_db_name;\"",
+            unless  => "/usr/bin/mysql --defaults-file=/root/.my.cnf -uroot 
${keystone_db_name} -e 'exit'",
+            command => "/usr/bin/mysql --defaults-file=/root/.my.cnf -uroot -e 
\"create database ${keystone_db_name};\"",
             require => [Class['mysql'], File['/root/.my.cnf']],
             before  => Exec['create_keystone_db_user'];
     }

-- 
To view, visit https://gerrit.wikimedia.org/r/179452
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1617de53c7278d1245ecd478f9a07be34b70a90
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits