svn commit: r1377003 - /whirr/trunk/core/src/main/java/org/apache/whirr/compute/BootstrapTemplate.java

[abayer]

Author: abayer
Date: Fri Aug 24 17:38:03 2012
New Revision: 1377003

URL: http://svn.apache.org/viewvc?rev=1377003&view=rev
Log:
WHIRR-641. Missing piece to ensure that options are set properly

Modified:
    
whirr/trunk/core/src/main/java/org/apache/whirr/compute/BootstrapTemplate.java

Modified: 
whirr/trunk/core/src/main/java/org/apache/whirr/compute/BootstrapTemplate.java
URL: 
http://svn.apache.org/viewvc/whirr/trunk/core/src/main/java/org/apache/whirr/compute/BootstrapTemplate.java?rev=1377003&r1=1377002&r2=1377003&view=diff
==============================================================================
--- 
whirr/trunk/core/src/main/java/org/apache/whirr/compute/BootstrapTemplate.java 
(original)
+++ 
whirr/trunk/core/src/main/java/org/apache/whirr/compute/BootstrapTemplate.java 
Fri Aug 24 17:38:03 2012
@@ -18,7 +18,6 @@
 
 package org.apache.whirr.compute;
 
-import static org.jclouds.compute.options.TemplateOptions.Builder.runScript;
 import static org.jclouds.ec2.domain.RootDeviceType.EBS;
 import static org.jclouds.scriptbuilder.domain.Statements.appendFile;
 import static 
org.jclouds.scriptbuilder.domain.Statements.createOrOverwriteFile;
@@ -75,9 +74,10 @@ public class BootstrapTemplate {
     TemplateBuilder templateBuilder = computeService.templateBuilder().from(
         instanceTemplate.getTemplate() != null ? 
instanceTemplate.getTemplate() :
         clusterSpec.getTemplate());
-    templateBuilder.options(runScript(bootstrap));
+    Template template = templateBuilder.build();
+    template.getOptions().runScript(bootstrap);
     return setSpotInstancePriceIfSpecified(
-      computeService.getContext(), clusterSpec, templateBuilder.build(), 
instanceTemplate
+      computeService.getContext(), clusterSpec, template, instanceTemplate
     );
   }