X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=testsuites%2Frubbos%2Fpuppet_manifests%2Fmodules%2Frubbos_common%2Fmanifests%2Frubbos_common_on.pp;h=ca192f739368ea75fe38199e2d344c35db25ca6e;hb=2313d6c41a0ed086c3035cd17c2ca6952960a521;hp=8e7539eb668a0aba297c64c85b1f9e096999cf03;hpb=87d58363042410a1641fd97734d45c17b4acb0e5;p=bottlenecks.git

diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_common/manifests/rubbos_common_on.pp b/testsuites/rubbos/puppet_manifests/modules/rubbos_common/manifests/rubbos_common_on.pp
index 8e7539eb..ca192f73 100644
--- a/testsuites/rubbos/puppet_manifests/modules/rubbos_common/manifests/rubbos_common_on.pp
+++ b/testsuites/rubbos/puppet_manifests/modules/rubbos_common/manifests/rubbos_common_on.pp
@@ -9,13 +9,13 @@
 
 
 class rubbos_common::rubbos_common_on {
-
+  
   include params::rubbos_params
 
   # Declare some variables
-  $rubbos_app		= $params::rubbos_params::rubbos_app
-  $rubbos_app_tool	= $params::rubbos_params::rubbos_app_tool
-  $rubbos_home		= $params::rubbos_params::rubbos_home
+  $rubbos_app           = $params::rubbos_params::rubbos_app
+  $rubbos_app_tools     = $params::rubbos_params::rubbos_app_tools
+  $rubbos_home          = $params::rubbos_params::rubbos_home
 
   # Prepare RUBBOS_APP folder
   exec {'mkdir -p ${rubbos_app}':
@@ -24,19 +24,19 @@ class rubbos_common::rubbos_common_on {
         path    => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"],
   }
 
-  # Prepare RUBBOS_APP_TOOLS folder
-  exec {'mkdir -p ${rubbos_app_tool}':
-        command => "mkdir -p ${rubbos_app_tool}",
-        unless  => "test -d ${rubbos_app_tool}",
+  # Prepare RUBBOS_APP_TOOLS folder 
+  exec {'mkdir -p ${rubbos_app_tools}':
+        command => "mkdir -p ${rubbos_app_tools}",
+        unless  => "test -d ${rubbos_app_tools}",
         path    => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"],
   }
 
   # Prepare RUBBOS_HOME folder
   exec {'mkdir -p ${rubbos_home}':
-        command	=> "mkdir -p ${rubbos_home}",
-        unless	=> "test -d ${rubbos_home}",
-        path	=> ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"],
-        require	=> Exec['mkdir -p ${rubbos_app}'],
+        command => "mkdir -p ${rubbos_home}",
+        unless  => "test -d ${rubbos_home}",
+        path    => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"],
+        require => Exec['mkdir -p ${rubbos_app}'],
   }
 
   # Prepare common packages:
@@ -54,19 +54,19 @@ class rubbos_common::rubbos_common_on {
   }
 
   # Install jdk
-  file {'${rubbos_app_tool}/jdk-6u27-linux-x64.bin':
+  file {'${rubbos_app_tools}/jdk-6u27-linux-x64.bin':
         ensure  => file,
-        path    => "${rubbos_app_tool}/jdk-6u27-linux-x64.bin",
+        path    => "${rubbos_app_tools}/jdk-6u27-linux-x64.bin",
         source  => "puppet:///modules/rubbos_common/jdk-6u27-linux-x64.bin",
         mode    => 0711,
         backup  => false,
-	require	=> Exec['mkdir -p ${rubbos_app_tool}'],
+        require => Exec['mkdir -p ${rubbos_app_tools}'],
   }
   exec {'jdk-6u27-linux-x64.bin':
-        cwd     => "${rubbos_app_tool}",
-        command => "${rubbos_app_tool}/jdk-6u27-linux-x64.bin",
+        cwd     => "${rubbos_app_tools}",
+        command => "${rubbos_app_tools}/jdk-6u27-linux-x64.bin",
         path    => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"],
-        require => File['${rubbos_app_tool}/jdk-6u27-linux-x64.bin'],
+        require => File['${rubbos_app_tools}/jdk-6u27-linux-x64.bin'],
   }
 
 }