Merge pull request #90 from arthyrik/feature/fix_openstack_security_g…

…roups_bug [JENKINS-22587] JClouds does not honor security group against OpenStack
jenkinsci · Sep 12, 2015 · 4fdf555 · 4fdf555
2 parents 0950778 + ad0db36
commit 4fdf555
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/jclouds-plugin/src/main/java/jenkins/plugins/jclouds/compute/JCloudsSlaveTemplate.java b/jclouds-plugin/src/main/java/jenkins/plugins/jclouds/compute/JCloudsSlaveTemplate.java
@@ -344,7 +344,12 @@ public NodeMetadata get() {
 
         if (!Strings.isNullOrEmpty(securityGroups)) {
             LOGGER.info("Setting security groups to " + securityGroups);
-            options.securityGroups(csvToArray(securityGroups));
+            String[] securityGroupsArray = csvToArray(securityGroups);
+            options.securityGroups(securityGroupsArray);
+
+            if (options instanceof NovaTemplateOptions) {
+              options.as(NovaTemplateOptions.class).securityGroupNames(securityGroupsArray);
+            }
         }
 
         if (assignFloatingIp && options instanceof NovaTemplateOptions) {