bigfix: distribute rubbos.properties to every client server

JIRA: BOTTLENECK-62

Change-Id: Ic7268eaa9c3bdbbecd5e4a1066e42ac64c5f377d
Signed-off-by: wangyaoguang <sunshine.wang@huawei.com>

diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_client/manifests/rubbos_client_off.pp b/testsuites/rubbos/puppet_manifests/modules/rubbos_client/manifests/rubbos_client_off.pp
index b1d0b3d..aeb1f12 100644 (file)
--- a/testsuites/rubbos/puppet_manifests/modules/rubbos_client/manifests/rubbos_client_off.pp
+++ b/testsuites/rubbos/puppet_manifests/modules/rubbos_client/manifests/rubbos_client_off.pp
@@ -39,10 +39,10 @@ class rubbos_client::rubbos_client_off {
         backup          => false,
   }
 
-  # bench/rubbos.properties.template
-  file {'${rubbos_home}/bench/rubbos.properties.template':
+  # Client/rubbos.properties.template
+  file {'${rubbos_home}/Client/rubbos.properties.template':
         ensure          => absent,
-        path            => "${rubbos_home}/bench/rubbos.properties.template",
+        path            => "${rubbos_home}/Client/rubbos.properties.template",
         show_diff       => false,
         backup          => false,
   }

diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_client/manifests/rubbos_client_on.pp b/testsuites/rubbos/puppet_manifests/modules/rubbos_client/manifests/rubbos_client_on.pp
index 9bdf072..7cda7e1 100644 (file)
--- a/testsuites/rubbos/puppet_manifests/modules/rubbos_client/manifests/rubbos_client_on.pp
+++ b/testsuites/rubbos/puppet_manifests/modules/rubbos_client/manifests/rubbos_client_on.pp
@@ -119,16 +119,17 @@ class rubbos_client::rubbos_client_on {
         backup          => false,
   }
 
-  # rubbos.properties.template
-  file {'${rubbos_home}/bench/rubbos.properties.template':
+  # Client/rubbos.properties.template
+  file {'${rubbos_home}/Client/rubbos.properties.template':
         ensure          => file,
-        path            => "${rubbos_home}/bench/rubbos.properties.template",
+        path            => "${rubbos_home}/Client/rubbos.properties.template",
         source          => "puppet:///modules/rubbos_client/rubbos.properties.template",
         show_diff       => false,
         backup          => false,
+        require         => Exec['tar xvzf ${rubbos_home}/Client.tar.gz'],
   }
 
-  # executable scripts
+  # bench/executable scripts
   file {'${rubbos_home}/bench/run_emulator.sh':
         ensure          => file,
         path            => "${rubbos_home}/bench/run_emulator.sh",
@@ -153,7 +154,6 @@ class rubbos_client::rubbos_client_on {
                         File['${rubbos_home}/Makefile'],
                         File['${rubbos_home}/config.mk'],
                         Exec['tar xvzf ${rubbos_home}/Client.tar.gz']],
-                        #File['${rubbos_home}/Client']],
   }
 
   exec {'ant jar':