JENKINS-15149 EC2 documentation for VPC/security groups not clear

jenkinsci · Sep 12, 2012 · 0ef02fe · 0ef02fe
1 parent 394893d
commit 0ef02fe
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/src/main/resources/hudson/plugins/ec2/EC2Slave/help-securityGroups.html b/src/main/resources/hudson/plugins/ec2/EC2Slave/help-securityGroups.html
@@ -0,0 +1,5 @@
+<div>
+    Specify the security group names (do not specify the security group IDs) that will be applied to this instance.
+    If there are multiple security groups, separate them by a space. If the instance uses a VPC (you have specified
+    a subnet ID for the VPC), then all security groups need to be part of the VPC.
+</div>
diff --git a/src/main/resources/hudson/plugins/ec2/EC2Slave/help-subnetId.html b/src/main/resources/hudson/plugins/ec2/EC2Slave/help-subnetId.html
@@ -0,0 +1,4 @@
+<div>
+    Specify the subnet ID to be used with the VPC. Do not specify the VPC ID, the subnet ID will be used to locate the VPC.
+    When using the VPC, you must specify a security group that is contained in the VPC.
+</div>
diff --git a/src/main/resources/hudson/plugins/ec2/SlaveTemplate/config.jelly b/src/main/resources/hudson/plugins/ec2/SlaveTemplate/config.jelly
@@ -95,7 +95,7 @@ THE SOFTWARE.
       <f:checkbox />
     </f:entry>
 
-    <f:entry title="${%VPC Subnet ID}" field="subnetId">
+    <f:entry title="${%Subnet ID for VPC}" field="subnetId">
        <f:textbox />
     </f:entry>