Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

changed si.basic.mem property to si.instancetype (small, large, xlarg…

…e) in spotinstances.conf file
  • Loading branch information...
commit 332434e916801a03672924ed589bd37329596255 1 parent efa8d13
@pauloricardomg pauloricardomg authored
View
7 service/service/java/source/etc/workspace-service/other/main.conflocator.xml
@@ -136,4 +136,11 @@
</bean>
+ <bean id="elasticSettings"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+
+ <property name="location" value="$NIMBUS_HOME/services/etc/nimbus/elastic/elastic.conf" />
+ <property name="placeholderPrefix" value="$ELASTIC{" />
+ </bean>
+
</beans>
View
4 service/service/java/source/etc/workspace-service/other/main.xml
@@ -558,7 +558,7 @@
<constructor-arg ref="nimbus-rm.loglevels" />
<constructor-arg ref="nimbus-rm.home.instance"/>
<constructor-arg ref="nimbus-rm.home.group"/>
- <constructor-arg value="$SI{si.basic.minprice}" />
+ <constructor-arg value="$SI{si.minprice}" />
<constructor-arg ref="nimbus-rm.si.pricingmodel" />
<!-- set after object creation time to avoid circular dep -->
@@ -570,7 +570,7 @@
<property name="maxUtilization"
value="$SI{async.policies.maxutilization}" />
<property name="instanceMem"
- value="$SI{si.basic.mem}" />
+ value="$ELASTIC{memory.$SI{si.instancetype}}" />
</bean>
View
21 service/service/java/source/etc/workspace-service/spotinstances.conf
@@ -61,15 +61,24 @@ si.pricingmodel=org.globus.workspace.async.pricingmodel.MaximizeUtilizationPrici
# BASIC SPOT INSTANCE CONFIGURATION:
####################################
-# Defines the amount of memory (in MegaBytes) that
-# a Spot Instance of the basic type has
+# Defines the instance type that will become
+# available as spot instances
+#
+# The supported instance types are:
+# small, large and xlarge.
+#
+# The amount of memory for each instance type
+# is defined in the elastic.conf file.
+#
+# Currently, Nimbus only supports one type
+# of Spot Instance type per site.
-si.basic.mem=128
+si.instancetype=small
# Defines the minimum price (in allocation units) per minute
-# that a Spot Instance of the basic type can cost
+# that a Spot Instance can cost
-si.basic.minprice=0.1
+si.minprice=0.1
#############################
@@ -115,4 +124,4 @@ async.policies.minreservedmem=256
#
# * reservedMem = (1 - maxUtilization)*usedMem/maxUtilization
-async.policies.maxutilization=0.7
+async.policies.maxutilization=0.7
Please sign in to comment.
Something went wrong with that request. Please try again.