diff --git a/ui/scripts/installWizard.js b/ui/scripts/installWizard.js index e394e54ac01..902cb720a2a 100644 --- a/ui/scripts/installWizard.js +++ b/ui/scripts/installWizard.js @@ -252,13 +252,14 @@ var services = $.map(networkOffering.service, function(service) { return service.name; }); - - return $.inArray('SecurityGroup', services) == -1; + + //pick the network offering including SecurityGroup, but excluding Lb and StaticNat. (bug 13665) + return (($.inArray('SecurityGroup', services) != -1) && ($.inArray('Lb', services) == -1) && ($.inArray('StaticNat', services) == -1)) ; } - )[0]; + )[0]; } }); - + cloudStack.zoneWizard.action($.extend(true, {}, args, { // Plug in hard-coded values specific to quick install data: { @@ -266,7 +267,11 @@ networkType: 'Basic', domain: 1, networkOfferingId: selectedNetworkOffering.id - } + }, + pluginFrom: { + name: 'installWizard', + selectedNetworkOfferingHavingSG: true + } }, response: { success: function(args) { diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index d64c66ebedb..fc812dd3467 100644 --- a/ui/scripts/zoneWizard.js +++ b/ui/scripts/zoneWizard.js @@ -1423,7 +1423,10 @@ $("body").stopTime(updateNetworkServiceProviderTimer); if (result.jobstatus == 1) { //alert("Virtual Router Provider is enabled"); - + + if(args.data.pluginFrom != null && args.data.pluginFrom.name == "installWizard") { + selectedNetworkOfferingHavingSG = args.data.pluginFrom.selectedNetworkOfferingHavingSG; + } if(selectedNetworkOfferingHavingSG == true) { //need to Enable security group provider first // get network service provider ID of Security Group var securityGroupProviderId;