Test whether or not passing the passwordfile to asadmin when starting…

… a domain solves the problem.
fatmcgav · Feb 24, 2016 · 7a6043b · 7a6043b
1 parent c613a37
commit 7a6043b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/manifests/create_service.pp b/manifests/create_service.pp
@@ -52,7 +52,8 @@
   $mode          = 'domain',
   $das_port      = undef,
   $status_cmd    = undef,
-  $service_name  = undef) {
+  $service_name  = undef,
+  $asadmin_passfile = $glassfish::asadmin_passfile) {
   # Check that we've got a domain name if domain mode.
   if $mode == 'domain' and !$domain_name {
     fail('Domain name must be specified to install service for domain mode.')

diff --git a/templates/glassfish-init-domain-el.erb b/templates/glassfish-init-domain-el.erb
@@ -13,11 +13,12 @@ GLASSFISH_BIN="<%= scope.lookupvar('glassfish::glassfish_dir') %>/glassfish/bin"
 
 # Setup Domain and User values
 DOMAIN="<%= @domain_name %>"
+PWFILE="<%= @asadmin_passfile %>"
 USER="<%= @runuser %>"
 
 start() {
 	echo -n "Starting glassfish domain $DOMAIN: "
-	daemon --user $USER --pidfile /var/run/glassfish_$DOMAIN.pid "$GLASSFISH_BIN/asadmin start-domain $DOMAIN"
+	daemon --user $USER --pidfile /var/run/glassfish_$DOMAIN.pid "$GLASSFISH_BIN/asadmin start-domain --passwordfile $PWFILE $DOMAIN"
 	RETVAL=$?
 	if [ $RETVAL -eq 0 ]; then
 		PID=`ps U $USER | grep $DOMAIN | awk '{ print $1}'`