diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-03-31 18:57:25 +0200 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-03-31 19:19:26 +0200 |
commit | 0585a2ceb59f3eacd53f2a4546d6791eb154d562 (patch) | |
tree | d4e7bb0741b05526a99dd09048a3d870b4bdfcdd | |
parent | fd784158ad5973136a88b3cf40504cef355991af (diff) |
docs: Refresh Makefile related instructions
While at it, add instructions for selecting the custom kernel
from Armband DEB repos.
JIRA: ARMBAND-243
Change-Id: Ie8828241dc3a83d7268dfbd3526303dc674aef10
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r-- | docs/development/overview/build/build.instruction.rst | 13 | ||||
-rw-r--r-- | docs/release/installation/installation.instruction.rst | 32 |
2 files changed, 35 insertions, 10 deletions
diff --git a/docs/development/overview/build/build.instruction.rst b/docs/development/overview/build/build.instruction.rst index f3d59eeb..192c6ba7 100644 --- a/docs/development/overview/build/build.instruction.rst +++ b/docs/development/overview/build/build.instruction.rst @@ -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 1b85d711..e24fe27c 100644 --- a/docs/release/installation/installation.instruction.rst +++ b/docs/release/installation/installation.instruction.rst @@ -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 |