made installation of yourkit configurable via a boolean variable in t…

…he tomcat7 module's init.pp file
fcrepo4-labs · Oct 30, 2013 · 516903d · 516903d
1 parent 304b2df
commit 516903d
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 13 deletions.
diff --git a/modules/tomcat7/manifests/init.pp b/modules/tomcat7/manifests/init.pp
@@ -32,6 +32,8 @@
 #   }
 #
 
+
+
 class tomcat7 (
     $enable = true,
     $ensure = running,
@@ -44,11 +46,14 @@
 #    $repo_config = 'classpath:/config/clustered/repository.json',
     $etc_default_tomcat = 'tomcat7/default-tomcat7.erb',
 #    $etc_default_tomcat = 'tomcat7/default-tomcat7-clustered.erb',
+    $install_yourkit = false, 
 ) {
 
-  include yourkit
+  if ($install_yourkit) {
+    include yourkit
+    $yourkitdir = "$yourkit::yourkit"
+  }
 
-  $yourkitdir = "$yourkit::yourkit"
   $jre_package = "${jre}-jre-headless"
   $private_ip = "${ip_address}"
 
@@ -100,15 +105,31 @@
      notify => Service['tomcat7'],
      require => Package['tomcat7'],
   }
+
+  if ($install_yourkit) {
+
+    service { 'tomcat7':
+      ensure => $ensure,
+      enable => $enable,
+      require => [Package['tomcat7'],
+        File[$data_dir],
+        File['/etc/default/tomcat7'],
+        Exec['untar yourkit'],
+      ],
+    }
+
+  } 
+  else {
+
+    service { 'tomcat7':
+      ensure => $ensure,
+      enable => $enable,
+      require => [Package['tomcat7'],
+        File[$data_dir],
+        File['/etc/default/tomcat7'],
+      ],
+    }
 
-  service { 'tomcat7':
-    ensure => $ensure,
-    enable => $enable,
-    require => [Package['tomcat7'],
-      File[$data_dir],
-      File['/etc/default/tomcat7'],
-      Exec['untar yourkit'],
-    ],
   }
 
 }
diff --git a/modules/tomcat7/templates/default-tomcat7-clustered.erb b/modules/tomcat7/templates/default-tomcat7-clustered.erb
@@ -48,7 +48,9 @@ JAVA_OPTS="${JAVA_OPTS} -Djgroups.s3.bucket=fcrepo4-cluster-0"
 
 
 # YourKit Profiling
-#JAVA_OPTS="${JAVA_OPTS} -agentpath:/opt/<%= yourkitdir %>/bin/linux-x86-64/libyjpagent.so"
+<% if install_yourkit == true %>
+JAVA_OPTS="${JAVA_OPTS} -agentpath:/opt/<%= yourkitdir %>/bin/linux-x86-64/libyjpagent.so"
+<% end %>
 
 #set fcrepo4 baseUrl for fixity-service
 JAVA_OPTS="${JAVA_OPTS} -Dorg.fcrepo.fixity.fcrepo.url=http://localhost:8080/fcrepo/rest -Dorg.fcrepo.fixity.brokerurl=tcp://localhost:61616"

diff --git a/modules/tomcat7/templates/default-tomcat7.erb b/modules/tomcat7/templates/default-tomcat7.erb
@@ -40,8 +40,9 @@ JAVA_OPTS="${JAVA_OPTS} -Dfcrepo.infinispan.cache_configuration=config/infinispa
 
 
 # YourKit Profiling
+<% if install_yourkit == true %>
 JAVA_OPTS="${JAVA_OPTS} -agentpath:/opt/<%= yourkitdir %>/bin/linux-x86-64/libyjpagent.so"
-
+<% end %>
 
 #setup logging config
 JAVA_OPTS="${JAVA_OPTS} -Djava.util.logging.config.file=/var/lib/tomcat7/conf/logging.properties"

diff --git a/modules/yourkit/manifests/init.pp b/modules/yourkit/manifests/init.pp
@@ -25,14 +25,16 @@
 
   $yourkit_tar = "${yourkit}-linux.tar.bz2"
   $yourkit_tar_dest = "/opt/${yourkit_tar}"
-
+  
   exec { 'download yourkit':
     command => "/usr/bin/wget ${url}/${yourkit_tar} -O ${yourkit_tar_dest}",
     creates => "${yourkit_tar_dest}",
+    onlyif => "/usr/bin/test ${install_yourkit} = true",
   }
 
   exec { 'untar yourkit':
     command => "/bin/tar xfj ${yourkit_tar_dest}",
+    onlyif => "/usr/bin/test ${install_yourkit} = true",
     cwd => "/opt",
     creates => "/opt/${yourkit}",
     require => Exec['download'],