From: MatthewLi <matthew.lijun@huawei.com>
Date: Thu, 14 Apr 2016 11:21:36 +0000 (+0000)
Subject: Merge "rewrite Dockerfile"
X-Git-Tag: colorado.1.0~59
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=378094d7ad21a21bcb5067053db2e904ae792f18;hp=e1b4821d75cf0e9876731653570dc1efb5dc49fb;p=bottlenecks.git

Merge "rewrite Dockerfile"
---

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 b1d0b3db..aeb1f12f 100644
--- 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 9bdf0724..7cda7e14 100644
--- 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':