Merge "nova-net: Remove remaining nova-network quotas"

This commit is contained in:
Zuul
2020-01-27 12:33:15 +00:00
committed by Gerrit Code Review
29 changed files with 194 additions and 351 deletions
+3 -3
View File
@@ -4,11 +4,11 @@
"maxImageMeta": 128,
"maxPersonality": 5,
"maxPersonalitySize": 10240,
"maxSecurityGroupRules": 20,
"maxSecurityGroups": 10,
"maxSecurityGroupRules": -1,
"maxSecurityGroups": -1,
"maxServerMeta": 128,
"maxTotalCores": 20,
"maxTotalFloatingIps": 10,
"maxTotalFloatingIps": -1,
"maxTotalInstances": 10,
"maxTotalKeypairs": 100,
"maxTotalRAMSize": 51200,
@@ -2,7 +2,7 @@
"quota_class_set": {
"cores": 20,
"fixed_ips": -1,
"floating_ips": 10,
"floating_ips": -1,
"id": "test_class",
"injected_file_content_bytes": 10240,
"injected_file_path_bytes": 255,
@@ -11,7 +11,7 @@
"key_pairs": 100,
"metadata_items": 128,
"ram": 51200,
"security_group_rules": 20,
"security_groups": 10
"security_group_rules": -1,
"security_groups": -1
}
}
@@ -3,14 +3,14 @@
"instances": 50,
"cores": 50,
"ram": 51200,
"floating_ips": 10,
"floating_ips": -1,
"fixed_ips": -1,
"metadata_items": 128,
"injected_files": 5,
"injected_file_content_bytes": 10240,
"injected_file_path_bytes": 255,
"security_groups": 10,
"security_group_rules": 20,
"security_groups": -1,
"security_group_rules": -1,
"key_pairs": 100
}
}
@@ -2,7 +2,7 @@
"quota_class_set": {
"cores": 50,
"fixed_ips": -1,
"floating_ips": 10,
"floating_ips": -1,
"injected_file_content_bytes": 10240,
"injected_file_path_bytes": 255,
"injected_files": 5,
@@ -10,7 +10,7 @@
"key_pairs": 100,
"metadata_items": 128,
"ram": 51200,
"security_group_rules": 20,
"security_groups": 10
"security_group_rules": -1,
"security_groups": -1
}
}
@@ -2,7 +2,7 @@
"quota_set": {
"cores": 20,
"fixed_ips": -1,
"floating_ips": 10,
"floating_ips": -1,
"id": "fake_tenant",
"injected_file_content_bytes": 10240,
"injected_file_path_bytes": 255,
@@ -11,8 +11,8 @@
"key_pairs": 100,
"metadata_items": 128,
"ram": 51200,
"security_group_rules": 20,
"security_groups": 10,
"security_group_rules": -1,
"security_groups": -1,
"server_groups": 10,
"server_group_members": 10
}
@@ -12,7 +12,7 @@
},
"floating_ips": {
"in_use": 0,
"limit": 10,
"limit": -1,
"reserved": 0
},
"id": "fake_tenant",
@@ -53,12 +53,12 @@
},
"security_group_rules": {
"in_use": 0,
"limit": 20,
"limit": -1,
"reserved": 0
},
"security_groups": {
"in_use": 0,
"limit": 10,
"limit": -1,
"reserved": 0
},
"server_group_members": {
@@ -2,7 +2,7 @@
"quota_set": {
"cores": 20,
"fixed_ips": -1,
"floating_ips": 10,
"floating_ips": -1,
"id": "fake_tenant",
"injected_file_content_bytes": 10240,
"injected_file_path_bytes": 255,
@@ -11,8 +11,8 @@
"key_pairs": 100,
"metadata_items": 128,
"ram": 51200,
"security_group_rules": 20,
"security_groups": 10,
"security_group_rules": -1,
"security_groups": -1,
"server_groups": 10,
"server_group_members": 10
}
@@ -2,7 +2,7 @@
"quota_set": {
"cores": 20,
"fixed_ips": -1,
"floating_ips": 10,
"floating_ips": -1,
"injected_file_content_bytes": 10240,
"injected_file_path_bytes": 255,
"injected_files": 5,
@@ -10,8 +10,8 @@
"key_pairs": 100,
"metadata_items": 128,
"ram": 51200,
"security_group_rules": 20,
"security_groups": 10,
"security_group_rules": -1,
"security_groups": -1,
"server_groups": 10,
"server_group_members": 10
}
@@ -1,5 +1,5 @@
{
"quota_set": {
"security_groups": 45
"cores": 45
}
}
}
@@ -1,8 +1,8 @@
{
"quota_set": {
"cores": 20,
"cores": 45,
"fixed_ips": -1,
"floating_ips": 10,
"floating_ips": -1,
"injected_file_content_bytes": 10240,
"injected_file_path_bytes": 255,
"injected_files": 5,
@@ -10,8 +10,8 @@
"key_pairs": 100,
"metadata_items": 128,
"ram": 51200,
"security_group_rules": 20,
"security_groups": 45,
"security_group_rules": -1,
"security_groups": -1,
"server_groups": 10,
"server_group_members": 10
}
@@ -2,7 +2,7 @@
"quota_set": {
"cores": 20,
"fixed_ips": -1,
"floating_ips": 10,
"floating_ips": -1,
"id": "fake_tenant",
"injected_file_content_bytes": 10240,
"injected_file_path_bytes": 255,
@@ -11,8 +11,8 @@
"key_pairs": 100,
"metadata_items": 128,
"ram": 51200,
"security_group_rules": 20,
"security_groups": 10,
"security_group_rules": -1,
"security_groups": -1,
"server_groups": 10,
"server_group_members": 10
}
@@ -2,7 +2,7 @@
"quota_set": {
"cores": 20,
"fixed_ips": -1,
"floating_ips": 10,
"floating_ips": -1,
"injected_file_content_bytes": 10240,
"injected_file_path_bytes": 255,
"injected_files": 5,
@@ -10,8 +10,8 @@
"key_pairs": 100,
"metadata_items": 128,
"ram": 51200,
"security_group_rules": 20,
"security_groups": 10,
"security_group_rules": -1,
"security_groups": -1,
"server_groups": 10,
"server_group_members": 10
}