diff --git a/docs/en-US/offerings.xml b/docs/en-US/offerings.xml
index 10252fd8af4..ca6312d7bfe 100644
--- a/docs/en-US/offerings.xml
+++ b/docs/en-US/offerings.xml
@@ -1,25 +1,22 @@
-
%BOOK_ENTITIES;
]>
-
@@ -28,4 +25,5 @@
are discussed in the section on setting up networking for users.
+
diff --git a/docs/en-US/sys-offering-sysvm.xml b/docs/en-US/sys-offering-sysvm.xml
new file mode 100644
index 00000000000..cccf3e04796
--- /dev/null
+++ b/docs/en-US/sys-offering-sysvm.xml
@@ -0,0 +1,75 @@
+
+
+%BOOK_ENTITIES;
+]>
+
+
+ Changing the Default System Offering for System VMs
+ You can manually change the system offering for a particular System VM. Additionally, as a
+ &PRODUCT; administrator, you can also change the default system offering used for System
+ VMs.
+
+
+ Create a new system offering.
+ For more information, see
+ Creating a New System Service Offering.
+
+
+ Back up the database:
+ mysqldump -u root -p cloud | bzip2 > cloud_backup.sql.bz2
+
+
+ Open an MySQL prompt:
+ mysql -u cloud -p cloud
+
+
+ Run the following queries on the cloud database.
+
+
+ In the disk_offering table, identify the original default offering and the new
+ offering you want to use by default.
+ Take a note of the ID of the new offering.
+ select id,name,unique_name,type from disk_offering;
+
+
+ For the original default offering, set the value of unique_name to NULL.
+ # update disk_offering set unique_name = NULL where id = 10;
+ Ensure that you use the correct value for the ID.
+
+
+ For the new offering that you want to use by default, set the value of unique_name
+ as follows:
+ For the default Console Proxy VM (CPVM) offering,set unique_name to
+ 'Cloud.com-ConsoleProxy'. For the default Secondary Storage VM (SSVM) offering, set
+ unique_name to 'Cloud.com-SecondaryStorage'. For example:
+ update disk_offering set unique_name = 'Cloud.com-ConsoleProxy' where id = 16;
+
+
+
+
+ Restart &PRODUCT; Management Server. Restarting is required because the default
+ offerings are loaded into the memory at startup.
+ service cloud-management restart
+
+
+ Destroy the existing CPVM or SSVM offerings and wait for them to be recreated. The new
+ CPVM or SSVM are configured with the new offering.
+
+
+
diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js
index 59e9d8bbd15..4c327ee759b 100644
--- a/ui/scripts/accounts.js
+++ b/ui/scripts/accounts.js
@@ -642,12 +642,16 @@
},
vmLimit: {
label: 'label.instance.limits',
- isEditable: function(context) {
+ isEditable: function(context) {
+
+ if(context.accounts == undefined)
+ return false;
+ else {
if (context.accounts[0].accounttype == roleTypeUser || context.accounts[0].accounttype == roleTypeDomainAdmin) //updateResourceLimits is only allowed on account whose type is user or domain-admin
return true;
else
return false;
- }
+ } }
},
ipLimit: {
label: 'label.ip.limits',
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index bd8d3316103..def6d443026 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -1322,6 +1322,13 @@
networkOfferingObjs = json.listnetworkofferingsresponse.networkoffering;
if (networkOfferingObjs != null && networkOfferingObjs.length > 0) {
for (var i = 0; i < networkOfferingObjs.length; i++) {
+
+ if(args.scope=="account-specific" && args.context.zones[0].securitygroupsenabled == true) { //BUG - CLOUDSTACK-1063
+ var serviceObjArray = networkOfferingObjs[i].name;
+ if(serviceObjArray == "DefaultSharedNetworkOfferingWithSGService"){
+ continue;
+ }
+ }
//comment out the following 12 lines because of CS-16718
/*
diff --git a/ui/scripts/ui-custom/instanceWizard.js b/ui/scripts/ui-custom/instanceWizard.js
index 67d2a69c968..6e993843562 100644
--- a/ui/scripts/ui-custom/instanceWizard.js
+++ b/ui/scripts/ui-custom/instanceWizard.js
@@ -860,8 +860,19 @@
// Previous button
if ($target.closest('div.button.previous').size()) {
- var index = $steps.filter(':visible').index();
- if (index) showStep(index);
+ var $step = $steps.filter(':visible');
+ var $networkStep = $steps.filter('.network');
+ var index = $step.index();
+
+ $networkStep.removeClass('next-use-security-groups');
+
+ if (index) {
+ if (index == $steps.size() - 1 && $networkStep.hasClass('next-use-security-groups')) {
+ showStep(5);
+ } else {
+ showStep(index);
+ }
+ }
return false;
}