diff options
6 files changed, 188 insertions, 57 deletions
diff --git a/docs/development/overview/build/build.instruction.rst b/docs/development/overview/build/build.instruction.rst index 6f6cd08a..192c6ba7 100644 --- a/docs/development/overview/build/build.instruction.rst +++ b/docs/development/overview/build/build.instruction.rst @@ -125,7 +125,7 @@ Now it is time to clone the code repository: .. code-block:: bash - $ git clone ssh://<Linux foundation user>@gerrit.opnfv.org:29418/fuel + $ git clone ssh://<Linux foundation user>@gerrit.opnfv.org:29418/armband Now you should have the OPNFV armband repository with its directories stored locally on your build host. @@ -218,7 +218,7 @@ should first initialize the submodules and apply armband patches .. code-block:: bash - $ make patches-import + $ make fuel-patches-import Configure your build environment @@ -227,15 +227,14 @@ Configure your build environment ** Configuring the build environment should not be performed if building standard Danube release ** -Select the versions of the components you want to build by editing the -<armband/upstream/fuel/build/config.mk> and -<armband/upstream/fuel/build/armband.mk> files. +Select the versions of the components you want to build by editing +<armband/armband-fuel-config.mk>. Note! The same observation as above, before altering Makefile, run: .. code-block:: bash - $ make patches-import + $ make fuel-patches-import Non official build: Selecting which plugins to build @@ -246,7 +245,7 @@ individual developer locally), the selection if which Fuel plugins to build (if any) can be done by environment variable "BUILD_FUEL_PLUGINS" prior to building. -Only the plugin targets from <armband/upstream/fuel/build/armband.mk> that +Only the plugin targets from <armband/armband-fuel-config.mk> that are specified in the environment variable will then be built. In order to completely disable the building of plugins, the environment variable is set to " ". When using this functionality, the resulting iso file @@ -279,7 +278,7 @@ Following targets exist: - release - this will do the same as: - - make submodules-clean patches-import build + - make submodules-clean fuel-patches-import build - none/all/build - this will: diff --git a/docs/release/installation/installation.instruction.rst b/docs/release/installation/installation.instruction.rst index 80520fed..e24fe27c 100644 --- a/docs/release/installation/installation.instruction.rst +++ b/docs/release/installation/installation.instruction.rst @@ -338,7 +338,7 @@ Install additional Plugins/Features on the FUEL node .. figure:: img/plugin_install.png - **NOTE**: AArch64 Colorado 1.0 ships only with ODL, OVS, BGPVPN and Tacker + **NOTE**: AArch64 Danube 1.0 ships only with ODL, OVS, BGPVPN, SFC and Tacker plugins, see *Reference 15*. Create an OpenStack Environment @@ -350,7 +350,7 @@ Create an OpenStack Environment .. figure:: img/newenv.png -#. Select "<Mitaka on Ubuntu 14.04 (aarch64)>" and press <Next> +#. Select "<Newton on Ubuntu 16.04 (aarch64)>" and press <Next> #. Select "compute virtulization method". @@ -547,6 +547,10 @@ Allocate nodes to environment and assign functional roles OPTIONAL - Set Local Mirror Repos ================================= +**NOTE**: Support for local mirrors is incomplete in Danube 1.0. +You may opt in for it to fetch less packages from internet during deployment, +but an internet connection is still required. + The following steps must be executed if you are in an environment with no connection to the Internet. The Fuel server delivers a local repo that can be used for installation / deployment of openstack. @@ -555,11 +559,11 @@ that can be used for installation / deployment of openstack. - Replace the URI values for the "Name" values outlined below: - - "ubuntu" URI="deb http://<ip-of-fuel-server>:8080/mirrors/ubuntu/ trusty main" + - "ubuntu" URI="deb http://<ip-of-fuel-server>:8080/mirrors/ubuntu/ xenial main" - - "mos" URI="deb http://<ip-of-fuel-server>::8080/mitaka-9.0/ubuntu/x86_64 mos9.0 main restricted" + - "mos" URI="deb http://<ip-of-fuel-server>::8080/newton-10.0/ubuntu/x86_64 mos10.0 main restricted" - - "Auxiliary" URI="deb http://<ip-of-fuel-server>:8080/mitaka-9.0/ubuntu/auxiliary auxiliary main restricted" + - "Auxiliary" URI="deb http://<ip-of-fuel-server>:8080/newton-10.0/ubuntu/auxiliary auxiliary main restricted" - Click <Save Settings> at the bottom to Save your changes @@ -589,6 +593,28 @@ Target specific configuration .. figure:: img/fuelwsrepsst.png +#. [AArch64 specific] Use kernel 4.8 for experimental GICv3 features + + **NOTE**: This kernel is required for: SFC scenarios, GICv3 live migration. + + **NOTE**: This kernel is included in the Armband ISO, all that is needed + for it to be used in a specific environemnt is to explicitly add it to + the list of packages that will be installed by baremetal provisioning. + + In the FUEL UI of your Environment, click the <Settings> tab, click + <General> on the left side pane, then at the bottom of the page, in the + <Provision> subsection, amend the package list: + + - remove <linux-headers-generic-lts-xenial>; + + - remove <linux-image-generic-lts-xenial>; + + - add <linux-image-4.8.0-9944-generic>; + + - add <linux-headers-4.8.0-9944-generic>; + + - add <linux-image-extra-4.8.0-9944-generic> (optional); + #. Set up targets for provisioning with non-default "Offloading Modes" Some target nodes may require additional configuration after they are @@ -715,7 +741,7 @@ Fuel 11) `Fuel Plugin Developers Guide <http://docs.openstack.org/developer/fuel-docs/plugindocs/fuel-plugin-sdk-guide.html>`_ 12) `(N/A on AArch64) Fuel OpenStack Hardware Compatibility List <https://www.mirantis.com/software/hardware-compatibility/>`_ -Fuel in OPNFV +Armband Fuel in OPNFV 13) `OPNFV Installation instruction for the AArch64 Danube release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/armband/docs/release_installation/index.html>`_ diff --git a/docs/release/release-notes/release-notes.rst b/docs/release/release-notes/release-notes.rst index cbc2f032..22922fd6 100644 --- a/docs/release/release-notes/release-notes.rst +++ b/docs/release/release-notes/release-notes.rst @@ -38,12 +38,12 @@ supplemented with OPNFV unique components such as: - `OpenDaylight <http://www.opendaylight.org/software>`_ - `Open vSwitch for NFV <https://wiki.opnfv.org/ovsnfv>`_ -- `BGPVPN <http://docs.openstack.org/developer/networking-bgpvpn>`_ - `Tacker <https://wiki.openstack.org/wiki/Tacker>`_ +- `Service Function Chaining <https://wiki.opnfv.org/service_function_chaining>`_ The following OPNFV plugins are not yet ported for AArch64: -- `Service Function Chaining <https://wiki.opnfv.org/service_function_chaining>`_ +- `BGPVPN <http://docs.openstack.org/developer/networking-bgpvpn>`_ - `SDN distributed routing and VPN <https://wiki.opnfv.org/sdnvpn>`_ - `NFV Hypervisors-KVM <https://wiki.opnfv.org/nfv-kvm>`_ - `VSPERF <https://wiki.opnfv.org/characterize_vswitch_performance_for_telco_nfv_use_cases>`_ @@ -238,5 +238,3 @@ Fuel in OPNFV 14) `OPNFV Build instruction for the AArch64 Danube release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/armband/docs/development_overview_build/index.html>`_ 15) `OPNFV Release Note for the AArch64 Danube release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/armband/docs/release_release-notes/index.html>`_ - -.. [1] OpenDaylight Boron RC2 is used when Service Function Chaining is enabled in Fuel plugin. diff --git a/patches/fuel-web/0004-nailgun-Openstack-release-Pin-kernel-to-4.8.0-9944.patch b/patches/fuel-web/0004-nailgun-Openstack-release-Pin-kernel-to-4.8.0-9944.patch new file mode 100644 index 00000000..a617c809 --- /dev/null +++ b/patches/fuel-web/0004-nailgun-Openstack-release-Pin-kernel-to-4.8.0-9944.patch @@ -0,0 +1,68 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2017 Enea AB and others. +: +: All rights reserved. This program and the accompanying materials +: are made available under the terms of the Apache License, Version 2.0 +: which accompanies this distribution, and is available at +: http://www.apache.org/licenses/LICENSE-2.0 +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Thu, 23 Mar 2017 01:40:45 +0100 +Subject: [PATCH] nailgun: Openstack release: Pin kernel to 4.8.0-9944 + +Since newer kernels have issues with AAVMF + vhost_net, +we need to also temporarily blacklist vhost_net. + +NOTE: This change also adds linux-image-extra packages to both x86_64 + and AArch64 target image(s). + +TODO: Remove vhost_net blacklist (later). + +JIRA: https://jira.opnfv.org/browse/ARMBAND-161 +JIRA: https://jira.opnfv.org/browse/ARMBAND-171 +JIRA: https://jira.opnfv.org/browse/ARMBAND-227 +JIRA: https://jira.opnfv.org/browse/ARMBAND-230 +JIRA: https://jira.opnfv.org/browse/ARMBAND-239 +JIRA: https://jira.opnfv.org/browse/ARMBAND-244 + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + nailgun/nailgun/fixtures/openstack.yaml | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml +index 5712006..d404168 100644 +--- a/nailgun/nailgun/fixtures/openstack.yaml ++++ b/nailgun/nailgun/fixtures/openstack.yaml +@@ -2164,8 +2164,9 @@ + grub-pc + hwloc + linux-firmware +- linux-headers-generic-lts-xenial +- linux-image-generic-lts-xenial ++ linux-headers-4.8.0-9944-generic ++ linux-image-4.8.0-9944-generic ++ linux-image-extra-4.8.0-9944-generic + lvm2 + mcollective + mdadm +@@ -2492,6 +2493,7 @@ + value: | + acl + anacron ++ armband-vhost-net-blacklist + bash-completion + bridge-utils + bsdmainutils +@@ -2504,8 +2506,9 @@ + grub-efi-arm64 + hwloc + linux-firmware +- linux-headers-generic-lts-xenial +- linux-image-generic-lts-xenial ++ linux-headers-4.8.0-9944-generic ++ linux-image-4.8.0-9944-generic ++ linux-image-extra-4.8.0-9944-generic + lvm2 + mcollective + mdadm diff --git a/patches/opnfv-fuel/arm64-bug-fixes/0002-bootstrap-Pin-kernel-to-4.4.0-45.patch b/patches/opnfv-fuel/arm64-bug-fixes/0002-bootstrap-Pin-kernel-to-4.4.0-45.patch deleted file mode 100644 index b75c1ffa..00000000 --- a/patches/opnfv-fuel/arm64-bug-fixes/0002-bootstrap-Pin-kernel-to-4.4.0-45.patch +++ /dev/null @@ -1,39 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 Enea AB and others. -: -: All rights reserved. This program and the accompanying materials -: are made available under the terms of the Apache License, Version 2.0 -: which accompanies this distribution, and is available at -: http://www.apache.org/licenses/LICENSE-2.0 -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Tue, 14 Mar 2017 19:56:50 +0100 -Subject: [PATCH] bootstrap: Pin kernel to 4.4.0-45 - -JIRA: https://jira.opnfv.org/browse/ARMBAND-239 - -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml -index ff5baa8..794cca8 100644 ---- a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml -+++ b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml -@@ -13,13 +13,13 @@ - extra_dirs: - - /usr/share/fuel_bootstrap_cli/files/xenial - output_dir: /tmp/ -- kernel_flavor: linux-image-generic-lts-xenial -+ kernel_flavor: linux-image-4.4.0-45-generic - packages: - - daemonize - - fuel-agent - - hwloc - - i40e-dkms - - linux-firmware -+ - linux-headers-4.4.0-45-generic -- - linux-headers-generic - - live-boot - - live-boot-initramfs-tools diff --git a/patches/opnfv-fuel/arm64-bug-fixes/0002-bootstrap-dea_base-Pin-kernel-to-4.8.0-9944.patch b/patches/opnfv-fuel/arm64-bug-fixes/0002-bootstrap-dea_base-Pin-kernel-to-4.8.0-9944.patch new file mode 100644 index 00000000..b0269419 --- /dev/null +++ b/patches/opnfv-fuel/arm64-bug-fixes/0002-bootstrap-dea_base-Pin-kernel-to-4.8.0-9944.patch @@ -0,0 +1,79 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2017 Enea AB and others. +: +: All rights reserved. This program and the accompanying materials +: are made available under the terms of the Apache License, Version 2.0 +: which accompanies this distribution, and is available at +: http://www.apache.org/licenses/LICENSE-2.0 +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Tue, 14 Mar 2017 19:56:50 +0100 +Subject: [PATCH] bootstrap, dea_base: Pin kernel to 4.8.0-9944 + +Since newer kernels have issues with AAVMF + vhost_net, +we need to also temporarily blacklist vhost_net. + +TODO: Remove vhost_net blacklist (later). + +JIRA: https://jira.opnfv.org/browse/ARMBAND-161 +JIRA: https://jira.opnfv.org/browse/ARMBAND-171 +JIRA: https://jira.opnfv.org/browse/ARMBAND-227 +JIRA: https://jira.opnfv.org/browse/ARMBAND-230 +JIRA: https://jira.opnfv.org/browse/ARMBAND-239 +JIRA: https://jira.opnfv.org/browse/ARMBAND-244 + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml | 5 +++-- + deploy/config/dea_base.yaml | 8 ++++++-- + 2 files changed, 9 insertions(+), 4 deletions(-) + +diff --git a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml +index ff5baa8..42765b6 100644 +--- a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml ++++ b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml +@@ -13,14 +13,15 @@ + extra_dirs: + - /usr/share/fuel_bootstrap_cli/files/xenial + output_dir: /tmp/ +- kernel_flavor: linux-image-generic-lts-xenial ++ kernel_flavor: linux-image-4.8.0-9944-generic + packages: + - daemonize + - fuel-agent + - hwloc + - i40e-dkms + - linux-firmware +- - linux-headers-generic ++ - linux-image-extra-4.8.0-9944-generic ++ - linux-headers-4.8.0-9944-generic + - live-boot + - live-boot-initramfs-tools + - lshw +diff --git a/deploy/config/dea_base.yaml b/deploy/config/dea_base.yaml +index 386686f..2a5928e 100644 +--- a/deploy/config/dea_base.yaml ++++ b/deploy/config/dea_base.yaml +@@ -534,6 +534,8 @@ settings: + + anacron + ++ armband-vhost-net-blacklist ++ + bash-completion + + bridge-utils +@@ -560,9 +562,11 @@ settings: + + linux-firmware + +- linux-headers-generic-lts-xenial ++ linux-image-4.8.0-9944-generic ++ ++ linux-image-extra-4.8.0-9944-generic + +- linux-image-generic-lts-xenial ++ linux-headers-4.8.0-9944-generic + + lvm2 + |