summaryrefslogtreecommitdiffstats
path: root/fuel
diff options
context:
space:
mode:
authorStefan K. Berg <stefan.k.berg@ericsson.com>2015-05-25 15:56:51 +0200
committerStefan K. Berg <stefan.k.berg@ericsson.com>2015-05-25 16:25:24 +0200
commit67d9915d4a0312cb2700846cf0ebdb96ea4c3102 (patch)
tree4e4af77c85e14b5d358c799b0d20c3893d9dcbaa /fuel
parent758473ccdd2f5c2a5bc2ab726b0cc8972f01eb62 (diff)
Updated Neutron quota settings for Fuel
Updated the following Neutron quotas in the Fuel defaults of neutron.conf: security_groups 10 to 50 floating ip 50 to 100 network 10 to 50 router 10 to 50 subnet 10 to 50 JIRA: BGS-51 Change-Id: I133625187ee95fc0d81fa874b20e293a4de3102c Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Diffstat (limited to 'fuel')
-rw-r--r--fuel/build/patch-packages/Makefile2
-rw-r--r--fuel/build/patch-packages/neutron-common/Makefile19
-rw-r--r--fuel/build/patch-packages/neutron-common/quota.patch67
3 files changed, 87 insertions, 1 deletions
diff --git a/fuel/build/patch-packages/Makefile b/fuel/build/patch-packages/Makefile
index 4388677..bd3a437 100644
--- a/fuel/build/patch-packages/Makefile
+++ b/fuel/build/patch-packages/Makefile
@@ -8,7 +8,7 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-SUBDIRS := debootstrap novnc
+SUBDIRS := debootstrap novnc neutron-common
SUBCLEAN = $(addsuffix .clean,$(SUBDIRS))
.PHONY: $(SUBDIRS) $(SUBCLEAN) clean
diff --git a/fuel/build/patch-packages/neutron-common/Makefile b/fuel/build/patch-packages/neutron-common/Makefile
new file mode 100644
index 0000000..e9d43a4
--- /dev/null
+++ b/fuel/build/patch-packages/neutron-common/Makefile
@@ -0,0 +1,19 @@
+TOP := $(shell pwd)
+
+.PHONY: all
+all:
+
+.PHONY: clean
+clean:
+ @rm -rf package
+ @rm -rf *.deb
+ @rm -rf patch-replacements
+ @rm -rf .package
+
+.PHONY: release
+release:
+ ../tools/deb_unpack neutron-common_*.deb $(ORIGISO)
+ patch -s -p0 < quota.patch
+ ../tools/deb_pack $(REVSTATE)
+ @cp *.deb ../release/packages
+ @cat patch-replacements >> ../release/patch-replacements
diff --git a/fuel/build/patch-packages/neutron-common/quota.patch b/fuel/build/patch-packages/neutron-common/quota.patch
new file mode 100644
index 0000000..6f179f0
--- /dev/null
+++ b/fuel/build/patch-packages/neutron-common/quota.patch
@@ -0,0 +1,67 @@
+*** package/etc/neutron/neutron.conf.orig 2015-05-25 15:50:09.933131041 +0200
+--- package/etc/neutron/neutron.conf 2015-05-25 15:55:07.859210010 +0200
+***************
+*** 502,518 ****
+ # default_quota = -1
+
+ # Number of networks allowed per tenant. A negative value means unlimited.
+! # quota_network = 10
+
+ # Number of subnets allowed per tenant. A negative value means unlimited.
+! # quota_subnet = 10
+
+ # Number of ports allowed per tenant. A negative value means unlimited.
+ # quota_port = 50
+
+ # Number of security groups allowed per tenant. A negative value means
+ # unlimited.
+! # quota_security_group = 10
+
+ # Number of security group rules allowed per tenant. A negative value means
+ # unlimited.
+--- 502,521 ----
+ # default_quota = -1
+
+ # Number of networks allowed per tenant. A negative value means unlimited.
+! # This quota modified by OPNFV: 10 -> 50
+! quota_network = 50
+
+ # Number of subnets allowed per tenant. A negative value means unlimited.
+! # This quota modified by OPNFV: 10 -> 50
+! quota_subnet = 50
+
+ # Number of ports allowed per tenant. A negative value means unlimited.
+ # quota_port = 50
+
+ # Number of security groups allowed per tenant. A negative value means
+ # unlimited.
+! # This quota modified by OPNFV: 10 -> 50
+! quota_security_group = 50
+
+ # Number of security group rules allowed per tenant. A negative value means
+ # unlimited.
+***************
+*** 538,547 ****
+ # quota_health_monitor = -1
+
+ # Number of routers allowed per tenant. A negative value means unlimited.
+! # quota_router = 10
+
+ # Number of floating IPs allowed per tenant. A negative value means unlimited.
+! # quota_floatingip = 50
+
+ # Number of firewalls allowed per tenant. A negative value means unlimited.
+ # quota_firewall = 1
+--- 541,552 ----
+ # quota_health_monitor = -1
+
+ # Number of routers allowed per tenant. A negative value means unlimited.
+! # This quota modified by OPNFV: 10 -> 50
+! quota_router = 50
+
+ # Number of floating IPs allowed per tenant. A negative value means unlimited.
+! # This quota modified by OPNFV: 50 -> 100
+! quota_floatingip = 100
+
+ # Number of firewalls allowed per tenant. A negative value means unlimited.
+ # quota_firewall = 1