From 5653e585231174604bbe7223e98b65f464ca75aa Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien.macchi@enovance.com>
Date: Tue, 4 Feb 2014 13:32:17 +0100
Subject: [PATCH] drop path param

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
---
 manifests/compute.pp            | 5 ++---
 manifests/identity.pp           | 5 ++---
 manifests/image.pp              | 2 +-
 manifests/network/controller.pp | 5 ++---
 manifests/orchestration.pp      | 5 ++---
 manifests/volume.pp             | 5 ++---
 6 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/manifests/compute.pp b/manifests/compute.pp
index d4e7a736..f780496b 100644
--- a/manifests/compute.pp
+++ b/manifests/compute.pp
@@ -95,9 +95,8 @@ class cloud::compute(
   # We check if DB tables are created, if not we populate Nova DB.
   # It's a hack to fit with our setup where we run MySQL/Galera
   exec {'nova_db_sync':
-    command => 'nova-manage db sync',
-    path    => '/usr/bin',
-    unless  => "mysql nova -h ${nova_db_host} -u ${encoded_user} -p${encoded_password} -e \"show tables\" | grep Tables"
+    command => '/usr/bin/nova-manage db sync',
+    unless  => "/usr/bin/mysql nova -h ${nova_db_host} -u ${encoded_user} -p${encoded_password} -e \"show tables\" | grep Tables"
   }
 
 }
diff --git a/manifests/identity.pp b/manifests/identity.pp
index 66a87bcb..69c361a2 100644
--- a/manifests/identity.pp
+++ b/manifests/identity.pp
@@ -529,9 +529,8 @@ class cloud::identity (
   # We check if DB tables are created, if not we populate Keystone DB.
   # It's a hack to fit with our setup where we run MySQL/Galera
   exec {'keystone_db_sync':
-    command => 'keystone-manage db_sync',
-    path    => '/usr/bin',
-    unless  => "mysql keystone -h ${keystone_db_host} -u ${encoded_user} -p${encoded_password} -e \"show tables\" | grep Tables"
+    command => '/usr/bin/keystone-manage db_sync',
+    unless  => "/usr/bin/mysql keystone -h ${keystone_db_host} -u ${encoded_user} -p${encoded_password} -e \"show tables\" | grep Tables"
   }
 
   @@haproxy::balancermember{"${::fqdn}-keystone_api":
diff --git a/manifests/image.pp b/manifests/image.pp
index 3ec21252..e1691245 100644
--- a/manifests/image.pp
+++ b/manifests/image.pp
@@ -131,7 +131,7 @@ class cloud::image(
   # It's a hack to fit with our setup where we run MySQL/Galera
   exec {'glance_db_sync':
     command => '/usr/bin/glance-manage db_sync',
-    unless  => '/usr/bin/mysql glance -e "show tables" | /bin/grep Tables'
+    unless  => "/usr/bin/mysql glance -h ${glance_db_host} -u ${encoded_glance_user} -p${encoded_glance_password} -e \"show tables\" | /bin/grep Tables"
   }
 
   # TODO(EmilienM) For later, I'll also add internal network support in HAproxy for all OpenStack API, to optimize North / South network traffic
diff --git a/manifests/network/controller.pp b/manifests/network/controller.pp
index c6020cec..9424d3d9 100644
--- a/manifests/network/controller.pp
+++ b/manifests/network/controller.pp
@@ -49,9 +49,8 @@ class cloud::network::controller(
   # We check if DB tables are created, if not we populate Neutron DB.
   # It's a hack to fit with our setup where we run MySQL/Galera
   exec {'neutron_db_sync':
-    command => 'neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade head',
-    path    => '/usr/bin',
-    unless  => "mysql neutron -h ${neutron_db_host} -u ${encoded_user} -p${encoded_password} -e \"show tables\" | grep Tables"
+    command => '/usr/bin/neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade head',
+    unless  => "/usr/bin/mysql neutron -h ${neutron_db_host} -u ${encoded_user} -p${encoded_password} -e \"show tables\" | grep Tables"
   }
 
   @@haproxy::balancermember{"${::fqdn}-neutron_api":
diff --git a/manifests/orchestration.pp b/manifests/orchestration.pp
index 03dce54b..da578f5c 100644
--- a/manifests/orchestration.pp
+++ b/manifests/orchestration.pp
@@ -56,9 +56,8 @@ class cloud::orchestration(
   # We check if DB tables are created, if not we populate Heat DB.
   # It's a hack to fit with our setup where we run MySQL/Galera
   exec {'heat_db_sync':
-    command => 'heat-manage --config-file /etc/heat/heat.conf db_sync',
-    path    => '/usr/bin',
-    unless  => "mysql heat -h ${heat_db_host} -u ${encoded_user} -p${encoded_password} -e \"show tables\" | grep Tables"
+    command => '/usr/bin/heat-manage --config-file /etc/heat/heat.conf db_sync',
+    unless  => "/usr/bin/mysql heat -h ${heat_db_host} -u ${encoded_user} -p${encoded_password} -e \"show tables\" | grep Tables"
   }
 
 }
diff --git a/manifests/volume.pp b/manifests/volume.pp
index 8e548521..93fc5375 100644
--- a/manifests/volume.pp
+++ b/manifests/volume.pp
@@ -50,9 +50,8 @@ class cloud::volume(
   # We check if DB tables are created, if not we populate Cinder DB.
   # It's a hack to fit with our setup where we run MySQL/Galera
   exec {'cinder_db_sync':
-    command => 'cinder-manage db sync',
-    path    => '/usr/bin',
-    unless  => "mysql cinder -h ${cinder_db_host} -u ${encoded_user} -p${encoded_password} -e \"show tables\" | grep Tables"
+    command => '/usr/bin/cinder-manage db sync',
+    unless  => "/usr/bin/mysql cinder -h ${cinder_db_host} -u ${encoded_user} -p${encoded_password} -e \"show tables\" | grep Tables"
   }
 
 }