updated the esmond paths in configuration script

* updated the esmond paths to use the same puppet variables as the regular testing class
HEP-Puppet · Apr 6, 2016 · 9cc68d8 · 9cc68d8
1 parent 6b74671
commit 9cc68d8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/manifests/esmond.pp b/manifests/esmond.pp
@@ -3,6 +3,8 @@
   $dbname        = $::perfsonar::params::esmond_dbname,
   $dbuser        = $::perfsonar::params::esmond_dbuser,
   $dbpassword    = $::perfsonar::params::esmond_dbpass,
+  $esmondroot    = $::perfsonar::params::esmond_root,
+  $esmondconf    = $::perfsonar::params::esmond_conf_path,
 ) inherits perfsonar::params {
   if $use_db_module {
     class { 'postgresql::server': }

diff --git a/templates/configure_esmond.erb b/templates/configure_esmond.erb
@@ -22,10 +22,9 @@ fi
 sed -i '/^JVM_OPTS="\$JVM_OPTS -Dcom.sun.management.jmx/ s/^/#/' /etc/cassandra/conf/cassandra-env.sh
 
 #set esmond env variables
-#export ESMOND_ROOT=/usr/lib/esmond
-#export ESMOND_CONF=/etc/esmond/esmond.conf
-#export DJANGO_SETTINGS_MODULE=esmond.settings
-. /etc/profile.d/esmond.sh
+export ESMOND_ROOT=<%= @esmondroot %>
+export ESMOND_CONF=<%= @esmondconf -%>/esmond.conf
+export DJANGO_SETTINGS_MODULE=esmond.settings
 
 #initialize python
 cd $ESMOND_ROOT