Author: tomwhite
Date: Wed Jul 11 19:03:19 2012
New Revision: 1360351
URL: http://svn.apache.org/viewvc?rev=1360351&view=rev
Log:
WHIRR-428. Always match a stable Canonical AMI on AWS EC2. Contributed by
Andrew Bayer.
Modified:
whirr/trunk/CHANGES.txt
whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/TemplateBuilderStrategy.java
Modified: whirr/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/whirr/trunk/CHANGES.txt?rev=1360351&r1=1360350&r2=1360351&view=diff
==============================================================================
--- whirr/trunk/CHANGES.txt (original)
+++ whirr/trunk/CHANGES.txt Wed Jul 11 19:03:19 2012
@@ -94,6 +94,9 @@ Trunk (unreleased changes)
WHIRR-587. Update version of jopt-simple (from 3.2 to 4.3) (asavu)
+ WHIRR-428. Always match a stable Canonical AMI on AWS EC2.
+ (Andrew Bayer via tomwhite)
+
BUG FIXES
WHIRR-582. Yarn service does not build in IntelliJ because of missing
Hadoop test dependencies (Frank Scholten)
Modified:
whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/TemplateBuilderStrategy.java
URL:
http://svn.apache.org/viewvc/whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/TemplateBuilderStrategy.java?rev=1360351&r1=1360350&r2=1360351&view=diff
==============================================================================
---
whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/TemplateBuilderStrategy.java
(original)
+++
whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/TemplateBuilderStrategy.java
Wed Jul 11 19:03:19 2012
@@ -42,7 +42,7 @@ public class TemplateBuilderStrategy {
// canonical images, but not testing ones
if ("aws-ec2".equals(clusterSpec.getProvider()))
- templateBuilder.imageDescriptionMatches("ubuntu-images/");
+
templateBuilder.imageDescriptionMatches("^(?!.*(daily|testing)).*ubuntu-images.*$");
}
if (clusterSpec.getHardwareId() != null ||
instanceTemplate.getHardwareId() != null) {
