Support cloud-formation compatible user-data in spot-instance slaves

cbek · Nov 20, 2014 · e322911 · e322911
1 parent 420806e
commit e322911
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/src/main/java/hudson/plugins/ec2/SlaveTemplate.java b/src/main/java/hudson/plugins/ec2/SlaveTemplate.java
@@ -583,11 +583,26 @@ private EC2AbstractSlave provisionSpot(TaskListener listener) throws AmazonClien
             // user-data for the request. Instead we generate a unique name from UUID
             // so that the slave has a unique name within Jenkins to register to.
             String slaveName = UUID.randomUUID().toString();
-            String newUserData = "JENKINS_URL=" + jenkinsUrl +
-                    "&SLAVE_NAME=" + slaveName +
-                    "&USER_DATA=" + Base64.encodeBase64String(userData.getBytes());
+            String newUserData = "";
+
+            // We want to allow node configuration with cloud-init and user-data,
+            // while maintaining backward compatibility with old ami's
+            // The 'new' way is triggered by the presence of '${SLAVE_NAME}'' in the user data 
+            // (which is not too much to ask)
+            if (userData.contains("${SLAVE_NAME}")) {
+                // The cloud-init compatible way
+                newUserData = new String(userData);
+                newUserData = newUserData.replace("${SLAVE_NAME}", slaveName);
+                newUserData = newUserData.replace("${JENKINS_URL}", jenkinsUrl);
+            } else {
+                // The 'old' way - maitain full backward compatibility
+                newUserData = "JENKINS_URL=" + jenkinsUrl +
+                        "&SLAVE_NAME=" + slaveName +
+                        "&USER_DATA=" + Base64.encodeBase64String(userData.getBytes());
+            }
 
             String userDataString = Base64.encodeBase64String(newUserData.getBytes());
+
             launchSpecification.setUserData(userDataString);
             launchSpecification.setKeyName(keyPair.getKeyName());
             launchSpecification.setInstanceType(type.toString());