diff options
| author |   wangyaoguang <sunshine.wang@huawei.com> | 2016-04-14 17:08:36 +0800 |
|---|---|---|
| committer | wangyaoguang <sunshine.wang@huawei.com> | 2016-04-14 17:10:29 +0800 |
| commit | ade2540910ba19c5195b03c1f282b662c4c3db22 (patch) | |
| tree | 121ac3c4ba02d6f2d54fc2556de8aa244765bd83 | |
| parent | 438bb0ede748a7c074f55e31fe64a0200073bef1 (diff) | |
bigfix: distribute rubbos.properties to every client server
JIRA: BOTTLENECK-62
Change-Id: Ic7268eaa9c3bdbbecd5e4a1066e42ac64c5f377d
Signed-off-by: wangyaoguang <sunshine.wang@huawei.com>
| -rw-r--r-- | testsuites/rubbos/puppet_manifests/modules/rubbos_client/manifests/rubbos_client_off.pp | 6 | ||||
| -rw-r--r-- | testsuites/rubbos/puppet_manifests/modules/rubbos_client/manifests/rubbos_client_on.pp | 10 |
2 files changed, 8 insertions, 8 deletions
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': |