Merge "[Launch Instance Fix] Security Group Nova Net" into stable/kilo

1 files changed, 7 insertions, 1 deletions

diff --git a/openstack_dashboard/static/dashboard/launch-instance/launch-instance.model.js b/openstack_dashboard/static/dashboard/launch-instance/launch-instance.model.js
index 912673101..5b707e00f 100644
--- a/openstack_dashboard/static/dashboard/launch-instance/launch-instance.model.js
+++ b/openstack_dashboard/static/dashboard/launch-instance/launch-instance.model.js
@@ -109,6 +109,7 @@
           volume: null
         },
         networks: [],
+        neutronEnabled: false,
         novaLimits: {},
         profiles: [],
         securityGroups: [],
@@ -319,7 +320,11 @@
         // pull out the ids from the security groups objects
         var security_group_ids = [];
         finalSpec.security_groups.forEach(function(securityGroup){
-          security_group_ids.push(securityGroup.id);
+          if(model.neutronEnabled) {
+            security_group_ids.push(securityGroup.id);
+          } else {
+            security_group_ids.push(securityGroup.name);
+          }
         });
         finalSpec.security_groups = security_group_ids;
       }
@@ -331,6 +336,7 @@
       }
 
       function onGetNetworks(data) {
+        model.neutronEnabled = true;
         model.networks.length = 0;
         push.apply(model.networks, data.data.items);
       }