diff options
Diffstat (limited to 'fuel')
| l--------- | fuel/build/opendaylight/ | 1 | ||||
| -rw-r--r-- | fuel/build/patch-packages/Makefile | 2 | ||||
| -rw-r--r-- | fuel/build/patch-packages/neutron-common/Makefile | 19 | ||||
| -rw-r--r-- | fuel/build/patch-packages/neutron-common/quota.patch | 67 | ||||
| -rw-r--r-- | fuel/docs/src/release-notes.rst | 38 |
5 files changed, 107 insertions, 20 deletions
diff --git a/fuel/build/opendaylight/ b/fuel/build/opendaylight/ deleted file mode 120000 index 0519ecb..0000000 --- a/fuel/build/opendaylight/ +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file 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 diff --git a/fuel/docs/src/release-notes.rst b/fuel/docs/src/release-notes.rst index 0b8187c..ddbe318 100644 --- a/fuel/docs/src/release-notes.rst +++ b/fuel/docs/src/release-notes.rst @@ -46,27 +46,30 @@ Arno release with the Fuel deployment tool Docs are licensed under a Creative Co | 2015-04-23 | 0.2 | Jonas Bjurel | Minor change | | | | | | +--------------------+--------------------+--------------------+--------------------+ -| 2015-05-12 | 0.3 | Chris Price | Minor edits | +| 2015-05-12 | 0.3 | Chris Price | Minor edits | | | | | | +--------------------+--------------------+--------------------+--------------------+ 2 Important notes =================== -This is the first OPNFV release of Arno using Fuel as the deploment stage of the OPNFV CI pipeline. The intention of this release is to establish a foundation platform to accelerate the development of the OPNFV infrastructure. +For the first OPNFV release (Arno), these notes introduce use of `OpenStack Fuel <https://wiki.openstack.org/wiki/Fuel>`_ for the deployment stage of the OPNFV continuous integration (CI) pipeline. The goal of the Arno release and this Fuel-based deployment process is to establish a foundational platform accelerating further development of the OPNFV infrastructure. -Carefully follow the installation-instructions and pay special attention to the pre-deploy script that needs to be run befor deployment is started. +Carefully follow the installation-instructions and pay special attention to the pre-deploy script that needs to be run before deployment is started. 3 Summary =========== -Arno release with the Fuel deployment tool uses the OpenStack Fuel upstream project version 6.0.1, but adds OPNFV unique components such as OpenDaylight version: Helium as well as other OPNFV unique configurations. +For Arno, the typical use of Fuel as an OpenStack installer is supplemented with OPNFV unique components such as `OpenDaylight <http://www.opendaylight.org/software>`_ version Helium as well as OPNFV-unique configurations. -This Arno release artefact provides the Fuel deployment tool as the deploy stage of the OPNFV CI pipeline including: +This Arno artefact provides Fuel as the deployment stage tool in the OPNFV CI pipeline including: - Documentation built by Jenkins -- The Arno .iso image built by Jenkins -- Automated deployment of the Arno release with the Fuel deployment tool stack instance on bare metal or a nested hypervisor environment (KVM) + - this document (release notes) + - installation instructions + - build-instructions +- The Arno Fuel installer image (.iso) built by Jenkins +- Automated deployment of Arno with running on bare metal or a nested hypervisor environment (KVM) - Automated validation of the Arno deployment @@ -74,16 +77,16 @@ This Arno release artefact provides the Fuel deployment tool as the deploy stage ================ +--------------------------------------+--------------------------------------+ -| **Project** | Arno/genesis/fuel | +| **Project** | Arno/genesis/fuel | | | | +--------------------------------------+--------------------------------------+ -| **Repo/tag** | genesis/arno | +| **Repo/tag** | genesis/arno | | | | +--------------------------------------+--------------------------------------+ -| **Release designation** | Arno | +| **Release designation** | Arno | | | | +--------------------------------------+--------------------------------------+ -| **Release date** | 2015-Spring | +| **Release date** | 2015-Spring | | | | +--------------------------------------+--------------------------------------+ @@ -95,15 +98,16 @@ This Arno release artefact provides the Fuel deployment tool as the deploy stage This is the first tracked release of genesis/fuel. It is based on following upstream versions: - Fuel 6.0.1 (Juno release) - - OpenDaylight Helium-SR2 4.1.2 Document version changes ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This is the first tracked version of genesis/fuel. It comes with the following documentation: -- OPNFV Installation instructions for the Arno release with the Fuel deployment tool - ver. 0.0.1 -- OPNFV Release Notes for Arno release with the Fuel deployment tool - ver. 0.1 (this document) +- OPNFV Installation instructions for Arno with Fuel as deployment tool +- OPNFV Release Notes for Arno use of Fuel as deployment tool +- OPNFV Build instructions for Arno with Fuel as deployment tool + 4.2 Reason for version ---------------------- @@ -139,7 +143,7 @@ This is the first tracked version of genesis/fuel. It comes with the following d 4.3.1 Software deliverables ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Fuel@OPNFV .iso file +Fuel-based installer iso (opnfv.iso) file 4.3.2 Documentation deliverables ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -196,6 +200,4 @@ Arno release with the Fuel deployment tool has undergone QA test runs with the f 7 References ============= -For more information on the OPNFV Arno release, please see: - -http://wiki.opnfv.org/release/arno +For more information on the OPNFV Arno release, please see http://wiki.opnfv.org/releases/arno. |