diff options
| -rw-r--r-- | .gitmodules | 4 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | TODO.md | 1 | ||||
| -rw-r--r-- | docs/build-instruction.rst | 105 | ||||
| -rw-r--r-- | docs/index.rst | 6 | ||||
| -rw-r--r-- | patches/fuel-agent/0010-UX-Update-bootstrap-target-build-time-estimate.patch | 33 | ||||
| -rw-r--r-- | patches/fuel-astute/0001-Increase-maximum-shell-command-timeout.patch | 33 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0026-deploy.sh-accept-a-timeout-flag-T.patch | 81 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0027-UX-Update-bootstrap-target-build-time-estimate.patch | 33 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0027-deploy-reap.py-Dump-extra-interfaces-information.patch | 90 | ||||
| m--------- | upstream/fuel-astute | 0 |
11 files changed, 344 insertions, 44 deletions
diff --git a/.gitmodules b/.gitmodules index 5124f69a..1d729b0c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -30,3 +30,7 @@ path = upstream/fuel-nailgun-agent url = https://github.com/openstack/fuel-nailgun-agent branch = stable/8.0 +[submodule "fuel-astute"] + path = upstream/fuel-astute + url = https://github.com/openstack/fuel-astute.git + branch = stable/8.0 @@ -61,6 +61,7 @@ build: UBUNTU_ARCH="amd64 arm64" \ FUELLIB_REPO=${root}/upstream/fuel-library \ NAILGUN_REPO=${root}/upstream/fuel-web \ + ASTUTE_REPO=${root}/upstream/fuel-astute \ FUEL_AGENT_REPO=${root}/upstream/fuel-agent \ FUEL_NAILGUN_AGENT_REPO=${root}/upstream/fuel-nailgun-agent \ FUEL_MIRROR_REPO=${root}/upstream/fuel-mirror \ @@ -68,6 +69,7 @@ build: ODL_CHANGE= \ FUELLIB_COMMIT=HEAD \ NAILGUN_COMMIT=HEAD \ + ASTUTE_COMMIT=HEAD \ FUEL_AGENT_COMMIT=HEAD \ FUEL_NAILGUN_AGENT_COMMIT=HEAD \ FUEL_MIRROR_COMMIT=HEAD \ @@ -3,7 +3,6 @@ List of missing features and things to do Cleanup tasks ========================================= -* [arm64-master] Find `puppetlabs-products` repo for arm64. * [arm64-master] Fix license in ubuntu_1404_arm64.pp * [arm64-master] Look into default ubuntu_debootstrap change in cobbler.pp * [arm64-master] [fuel-agent] Package and repo update for arm64 in [2] (?) diff --git a/docs/build-instruction.rst b/docs/build-instruction.rst index 2d66b7c0..32883c9d 100644 --- a/docs/build-instruction.rst +++ b/docs/build-instruction.rst @@ -1,5 +1,5 @@ ================================================================================================= -OPNFV Build instruction for the Brahmaputra release of OPNFV when using Fuel as a deployment tool +OPNFV Build instruction for the AArch64 Brahmaputra 3.0 release of OPNFV when using Fuel as a deployment tool ================================================================================================= License @@ -13,14 +13,14 @@ Abstract ======== This document describes how to build the Fuel deployment tool for the -Brahmaputra release of OPNFV build system, dependencies and required -system resources. +AArch64 Brahmaputra release of OPNFV build system, dependencies and +required system resources. Introduction ============ This document describes the build system used to build the Fuel -deployment tool for the Brahmaputra release of OPNFV, required +deployment tool for the AArch64 Brahmaputra release of OPNFV, required dependencies and minimum requirements on the host to be used for the build system. @@ -32,20 +32,24 @@ performed by the build system. The audience of this document is assumed to have good knowledge in network and Unix/Linux administration. +Due to early docker and nodejs support on AArch64, we will still use an +x86_64 Fuel Master to build and deploy an AArch64 target pool, as well +as an x86_64 build machine for building the OPNFV ISO. + Requirements ============ Minimum Hardware Requirements ----------------------------- -- ~30 GB available disc +- ~50 GB available disc - 4 GB RAM Minimum Software Requirements ----------------------------- -The build host should run Ubuntu 14.04 operating system. +The build host should run Ubuntu 14.04 (x86_64) operating system. On the host, the following packages must be installed: @@ -63,6 +67,8 @@ On the host, the following packages must be installed: - curl (simply available through $ sudo apt-get install curl) +- fuseiso (simply available through $ sudo apt-get install fuseiso) + Preparations ============ @@ -98,24 +104,24 @@ Setting up OPNFV Gerrit in order to being able to clone the code - Select "SSH Public Keys" to the left and then "Add Key" and paste your public key in. -Clone the OPNFV code Git repository with your SSH key -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Clone the armband@OPNFV code Git repository with your SSH key +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Now it is time to clone the code repository: -$ 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 fuel repository with the Fuel +Now you should have the OPNFV ARMBAND repository with its directories stored locally on your build host. Check out the Brahmaputra release: -$ cd fuel -$ git checkout brahmaputra.1.0 +$ cd armband +$ git checkout brahmaputra.3.0 -Clone the OPNFV code Git repository without a SSH key -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Clone the armband@OPNFV code Git repository without a SSH key +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ You can also opt to clone the code repository without a SSH key: -$ git clone https://gerrit.opnfv.org:29418/gerrit/fuel +$ git clone https://gerrit.opnfv.org:29418/gerrit/armband Make sure to checkout the release tag as described above. @@ -187,12 +193,19 @@ If neither of the two available methods for proxying rsync are available, the last resort is to turn off the caching of the Ubuntu packages in the build system. This is done by removing the "f_repobuild" from SUBDIRS in the beginning of -the fuel/build/f_isoroot/Makefile. +the armband/upstream/fuel/build/f_isoroot/Makefile. Note! Doing this will require the Fuel master node to have Internet access when installing the ISO artifact built as no Ubuntu package cache will be on the ISO! +Note! Armband build system uses git submodules to track fuel and +other upstream repos, so in order to apply the above change, one +should first initialize the submodules and apply armband patches +(only needed once): +$ make submodules-init +$ make patches-import + Configure your build environment -------------------------------- @@ -200,7 +213,10 @@ Configure your build environment standard Brahmaputra release ** Select the versions of the components you want to build by editing the -fuel/build/config.mk file. +armband/upstream/fuel/build/config.mk file. + +Note! The same observation as above, before altering Makefile, run: +$ make submodules-init patches-import Non official build: Selecting which plugins to build ---------------------------------------------------- @@ -209,7 +225,8 @@ 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 fuel/build/f_isoroot/Makefile that are +Only the plugin targets from +armband/upstream/fuel/build/f_isoroot/Makefile 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 @@ -219,24 +236,30 @@ that this is not a full build. This method of plugin selection is not meant to be used from within Gerrit! +Note! So far, only ODL plugin was ported to AArch64. + Building ======== -There are two methods available for building Fuel: +There is only one preffered method available for building Fuel for AArch64: - A low level method using Make -- An abstracted method using build.sh - Low level build method using make --------------------------------- The low level method is based on Make: -From the <fuel/build> directory, invoke <make [target]> +From the <armband> directory, invoke <make [target]> Following targets exist: -- none/all - this will: +- release - this will do the same as: + + - make submodules-clean clean-docker clean-build + + - make submodules-init patches-import build + +- none/all/build - this will: - Initialize the docker build environment @@ -252,40 +275,42 @@ Following targets exist: - Reconstruct a fuel .iso image -- clean - this will remove all artifacts from earlier builds. +- submodules-init - Initialize git submodules (fuel@OPNFV, fuel-library etc.) -- debug - this will simply enter the build container without starting a build, from here you can start a build by enter "make iso" +- submodules-clean - cleanup git submodules (fuel@OPNFV, fuel-library etc.) -If the build is successful, you will find the generated ISO file in -the <fuel/build/release> subdirectory! +- patches-import - this will apply armband@OPNFV patches to git submodules -Abstracted build method using build.sh --------------------------------------- -The abstracted build method uses the <fuel/ci/build.sh> script which -allows you to: +- patches-export - this will export git submodules changes as armband patches -- Create and use a build cache - significantly speeding up the - build time if upstream repositories have not changed. +- clean-build - this will remove all artifacts from earlier builds. -- push/pull cache and artifacts to an arbitrary URI (http(s):, file:, ftp:) +- clean-docker - this will remove all docker caches from earlier builds. -For more info type <fuel/ci/build.sh -h>. +If the build is successful, you will find the generated ISO file in +the <armband/upstream/fuel/build/release> subdirectory! Artifacts ========= The artifacts produced are: -- <OPNFV_XXXX.iso> - Which represents the bootable Fuel image, XXXX is - replaced with the build identity provided to the build system +- <OPNFV_XXXX.iso> - Which represents the bootable Fuel for AArch64 image, + XXXX is replaced with the build identity provided to the build system - <OPNFV_XXXX.iso.txt> - Which holds version metadata. References ========== -1) `OPNFV Installation instruction for the Brahmaputra release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/brahmaputra/docs/installation-instruction.html>`_ +1) `OPNFV Installation instruction for the Brahmaputra 3.0 release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/brahmaputra/docs/installation-instruction.html>`_ + +2) `OPNFV Build instruction for the Brahmaputra 3.0 release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/brahmaputra/docs/build-instruction.html>`_ + +3) `OPNFV Release Note for the Brahmaputra 3.0 release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/brahmaputra/docs/release-notes.html>`_ + +4) `OPNFV Installation instruction for the AArch64 Brahmaputra 3.0 release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/armband/brahmaputra/docs/installation-instruction.html>`_ -2) `OPNFV Build instruction for the Brahmaputra release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/brahmaputra/docs/build-instruction.html>`_ +5) `OPNFV Build instruction for the AArch64 Brahmaputra 3.0 release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/armband/brahmaputra/docs/build-instruction.html>`_ -3) `OPNFV Release Note for the Brahmaputra release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/brahmaputra/docs/release-notes.html>`_ +6) `OPNFV Release Note for the AArch64 Brahmaputra 3.0 release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/armband/brahmaputra/docs/release-notes.html>`_ diff --git a/docs/index.rst b/docs/index.rst index 6bba3aaf..815d4068 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -4,9 +4,9 @@ .. You should have received a copy of the license along with this work. .. If not, see <http://creativecommons.org/licenses/by/4.0/>. -********** -Fuel@OPNFV -********** +***************** +ArmbandFuel@OPNFV +***************** .. toctree:: :maxdepth: 4 diff --git a/patches/fuel-agent/0010-UX-Update-bootstrap-target-build-time-estimate.patch b/patches/fuel-agent/0010-UX-Update-bootstrap-target-build-time-estimate.patch new file mode 100644 index 00000000..d8a7588f --- /dev/null +++ b/patches/fuel-agent/0010-UX-Update-bootstrap-target-build-time-estimate.patch @@ -0,0 +1,33 @@ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Mon, 9 May 2016 17:08:06 +0200 +Subject: [PATCH] UX: Update bootstrap/target build time estimate. + +While building for a different architecture (e.g. AArch64 on x86_64), +the bootstrap/target image build may take longer, due to latency +introduced by using qemu-user-static. + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + .../fuel_bootstrap_cli/fuel_bootstrap/utils/bootstrap_image.py | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/utils/bootstrap_image.py b/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/utils/bootstrap_image.py +index 6e60fb8..95bc08a 100644 +--- a/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/utils/bootstrap_image.py ++++ b/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/utils/bootstrap_image.py +@@ -180,9 +180,12 @@ def make_bootstrap(data): + OSLO_CONF = cfg.CONF + OSLO_CONF(opts, project='fuel-agent') + mngr = manager.Manager(bootdata) +- LOG.info("Build process is in progress. Usually it takes 15-20 minutes." +- " It depends on your internet connection and hardware" +- " performance.") ++ LOG.info("Build process is in progress. Usually it takes 15-20 minutes for" ++ " a native build (x86_64) and/or 30-45 minutes for each" ++ " cross-build (e.g. AArch64)." ++ " It depends on your internet connection, hardware performance" ++ " and selected bootstrap architecture(s)." ++ " This ISO supports AArch64 only.") + mngr.do_mkbootstrap() + + return bootdata['bootstrap']['uuid'], bootdata['output'] diff --git a/patches/fuel-astute/0001-Increase-maximum-shell-command-timeout.patch b/patches/fuel-astute/0001-Increase-maximum-shell-command-timeout.patch new file mode 100644 index 00000000..d7048954 --- /dev/null +++ b/patches/fuel-astute/0001-Increase-maximum-shell-command-timeout.patch @@ -0,0 +1,33 @@ +From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> +Date: Mon, 9 May 2016 18:54:33 -0700 +Subject: [PATCH] Increase maximum shell command timeout to 2h + +Since `execute_shell_command` mcagent is used for building the target +image and the timeout provided in the astute task is just respected on +the Astute level (on mcollective level this timeout is actually a +minumum between value provided and ddl value) we need to increase it +for Armband operation. + +Because Armband builds the target image via `qemu-debootstrap`, it can +take more than 1 hour to finish the building. Therefore aside of +increasing the timeout in the Astute task, the maximum timeout value +for mcagent has to be increased. + +Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> +--- + mcagents/execute_shell_command.ddl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mcagents/execute_shell_command.ddl b/mcagents/execute_shell_command.ddl +index 0480be7..ad58046 100644 +--- a/mcagents/execute_shell_command.ddl ++++ b/mcagents/execute_shell_command.ddl +@@ -4,7 +4,7 @@ metadata :name => "Execute shell command", + :license => "Apache License 2.0", + :version => "8.0.0", + :url => "http://mirantis.com", +- :timeout => 3600 ++ :timeout => 7200 + + action "execute", :description => "Execute shell command" do + diff --git a/patches/opnfv-fuel/0026-deploy.sh-accept-a-timeout-flag-T.patch b/patches/opnfv-fuel/0026-deploy.sh-accept-a-timeout-flag-T.patch new file mode 100644 index 00000000..19651467 --- /dev/null +++ b/patches/opnfv-fuel/0026-deploy.sh-accept-a-timeout-flag-T.patch @@ -0,0 +1,81 @@ +From: Josep Puigdemont <josep.puigdemont@enea.com> +Date: Mon, 9 May 2016 11:05:58 +0200 +Subject: [PATCH] deploy.sh: accept a timeout flag (-T) + +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com> +--- + ci/deploy.sh | 19 +++++++++++++++---- + 1 file changed, 15 insertions(+), 4 deletions(-) + +diff --git a/ci/deploy.sh b/ci/deploy.sh +index c9b836b..5f06a19 100755 +--- a/ci/deploy.sh ++++ b/ci/deploy.sh +@@ -29,7 +29,7 @@ cat << EOF + xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + `basename $0`: Deploys the Fuel@OPNFV stack + +-usage: `basename $0` -b base-uri [-B PXE Bridge] [-f] [-F] [-H] -l lab-name -p pod-name -s deploy-scenario [-S image-dir] -i iso ++usage: `basename $0` -b base-uri [-B PXE Bridge] [-f] [-F] [-H] -l lab-name -p pod-name -s deploy-scenario [-S image-dir] [-T timeout] -i iso + -s deployment-scenario [-S optional Deploy-scenario path URI] + [-R optional local relen repo (containing deployment Scenarios] + +@@ -46,6 +46,7 @@ OPTIONS: + -p Pod-name + -s Deploy-scenario short-name/base-file-name + -S Storage dir for VM images ++ -T Timeout, in minutes, for the deploy. + -i iso url + + Description: +@@ -76,6 +77,8 @@ Input parameters to the build script is: + or a deployment short-name as defined by scenario.yaml in the deployment + scenario path. + -S Storage dir for VM images, default is fuel/deploy/images ++-T Timeout, in minutes, for the deploy. It defaults to using the DEPLOY_TIMEOUT ++ environment variable when defined, or to the default in deploy.py otherwise + -i .iso image to be deployed (needs to be provided in a URI + style, it can be a local resource: file:// or a remote resource http(s)://) + +@@ -111,6 +114,11 @@ FUEL_CREATION_ONLY='' + NO_DEPLOY_ENVIRONMENT='' + STORAGE_DIR='' + DRY_RUN=0 ++if ! [ -z $DEPLOY_TIMEOUT ]; then ++ DEPLOY_TIMEOUT="-dt $DEPLOY_TIMEOUT" ++else ++ DEPLOY_TIMEOUT="" ++fi + # + # END of variables to customize + ############################################################################ +@@ -118,7 +126,7 @@ DRY_RUN=0 + ############################################################################ + # BEGIN of main + # +-while getopts "b:B:dfFHl:p:s:S:i:he" OPTION ++while getopts "b:B:dfFHl:p:s:S:T:i:he" OPTION + do + case $OPTION in + b) +@@ -166,6 +174,9 @@ do + STORAGE_DIR="-s ${OPTARG}" + fi + ;; ++ T) ++ DEPLOY_TIMEOUT="-dt ${OPTARG}" ++ ;; + i) + ISO=${OPTARG} + if [[ ! $ISO == file://* ]] && \ +@@ -227,8 +238,8 @@ if [ $DRY_RUN -eq 0 ]; then + ISO=${SCRIPT_PATH}/ISO/image.iso + fi + # Start deployment +- echo "python deploy.py $STORAGE_DIR $PXE_BRIDGE $USE_EXISTING_FUEL $FUEL_CREATION_ONLY $NO_HEALTH_CHECK $NO_DEPLOY_ENVIRONMENT -dea ${SCRIPT_PATH}/config/dea.yaml -dha ${SCRIPT_PATH}/config/dha.yaml -iso $ISO" +- python deploy.py $STORAGE_DIR $PXE_BRIDGE $USE_EXISTING_FUEL $FUEL_CREATION_ONLY $NO_HEALTH_CHECK $NO_DEPLOY_ENVIRONMENT -dea ${SCRIPT_PATH}/config/dea.yaml -dha ${SCRIPT_PATH}/config/dha.yaml -iso $ISO ++ echo "python deploy.py $STORAGE_DIR $PXE_BRIDGE $USE_EXISTING_FUEL $FUEL_CREATION_ONLY $NO_HEALTH_CHECK $NO_DEPLOY_ENVIRONMENT -dea ${SCRIPT_PATH}/config/dea.yaml -dha ${SCRIPT_PATH}/config/dha.yaml -iso $ISO $DEPLOY_TIMEOUT" ++ python deploy.py $STORAGE_DIR $PXE_BRIDGE $USE_EXISTING_FUEL $FUEL_CREATION_ONLY $NO_HEALTH_CHECK $NO_DEPLOY_ENVIRONMENT -dea ${SCRIPT_PATH}/config/dea.yaml -dha ${SCRIPT_PATH}/config/dha.yaml -iso $ISO $DEPLOY_TIMEOUT + fi + popd > /dev/null + diff --git a/patches/opnfv-fuel/0027-UX-Update-bootstrap-target-build-time-estimate.patch b/patches/opnfv-fuel/0027-UX-Update-bootstrap-target-build-time-estimate.patch new file mode 100644 index 00000000..9791f595 --- /dev/null +++ b/patches/opnfv-fuel/0027-UX-Update-bootstrap-target-build-time-estimate.patch @@ -0,0 +1,33 @@ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Mon, 9 May 2016 17:05:53 +0200 +Subject: [PATCH] UX: Update bootstrap/target build time estimate. + +While building for a different architecture (e.g. AArch64 on x86_64), +the bootstrap/target image build may take longer, due to latency +introduced by using qemu-user-static. + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh b/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh +index 744f352..7395af3 100755 +--- a/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh ++++ b/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh +@@ -29,9 +29,12 @@ and added to cluster. \ + For more information please visit \ + https://docs.mirantis.com/openstack/fuel/fuel-master/" + bs_progress_message="There is no active bootstrap. Bootstrap image building \ +-is in progress. Usually it takes 15-20 minutes. It depends on your internet \ +-connection and hardware performance. Please reboot failed to discover nodes \ +-after bootstrap image become available." ++is in progress. Usually it takes 15-20 minutes for a native build (x86_64) \ ++and/or 30-45 minutes for each cross-build (e.g. AArch64). \ ++It depends on your internet connection, hardware performance and selected \ ++bootstrap architecture(s). This ISO supports AArch64 only. Please reboot \ ++failed to discover nodes after bootstrap image become available." ++ + bs_done_message="Default bootstrap image building done. Now you can boot new \ + nodes over PXE, they will be discovered and become available for installing \ + OpenStack on them" diff --git a/patches/opnfv-fuel/0027-deploy-reap.py-Dump-extra-interfaces-information.patch b/patches/opnfv-fuel/0027-deploy-reap.py-Dump-extra-interfaces-information.patch new file mode 100644 index 00000000..fba7e713 --- /dev/null +++ b/patches/opnfv-fuel/0027-deploy-reap.py-Dump-extra-interfaces-information.patch @@ -0,0 +1,90 @@ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Wed, 4 May 2016 18:31:09 +0200 +Subject: [PATCH] deploy/reap.py: Dump extra interfaces information. + +Since on AArch64, Ubuntu local mirror lacks arm64 packages (see [1]), +Fuel master requires internet connectivity during deploy, and hence +a way to setup such a public (extra) interface automatically. + +Previous commit "transplant: Generate extra interfaces config file" +introduced support for passing this information via DEA (override), +which may define a IFCGF_<interface> section in its 'fuel:' +section, containing the necessary keys to produce a ifcfg-<interface> +file, like in this example: + +fuel: + IFCFG_ETH1: + device: eth1 + ipaddress: 10.0.1.10 + netmask: 255.255.255.0 + gateway: 10.0.1.254 + +In order for Network Manager to use the newly added interfaces +for outgoing traffic and honor their GATEWAY setting (e.g. if we just +added one public interface), the default route on admin iface (most of +the time called eth0) is disabled when extra interfaces are present. + +FIXME: Only supports lowercase interface names, but so does Fuel, +see related bug report [2]. + +[1] https://jira.opnfv.org/browse/ARMBAND-35 +[2] https://jira.opnfv.org/browse/FUEL-136 + +Signed-off-by: Alexandu Avadanii <alexandru.avadanii@enea.com> +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com> +--- + deploy/reap.py | 34 ++++++++++++++++++++++++++++++++++ + 1 file changed, 34 insertions(+) + +diff --git a/deploy/reap.py b/deploy/reap.py +index bf64d40..6feaf17 100755 +--- a/deploy/reap.py ++++ b/deploy/reap.py +@@ -15,6 +15,8 @@ import yaml + import glob + import shutil + import tempfile ++import re ++import netaddr + + from common import ( + N, +@@ -245,6 +247,38 @@ class Reap(object): + if key not in ['ipaddress', 'netmask', + 'dhcp_pool_start', 'dhcp_pool_end']: + del fuel['ADMIN_NETWORK'][key] ++ ++ ## FIXME(armband): Factor in support for adding public/other interfaces. ++ ## TODO: Following block expects interface name(s) to be lowercase only ++ interfaces_list = exec_cmd('ip -o -4 a | grep -e "e[nt][hopsx].*"') ++ for interface in re.split('\n', interfaces_list): ++ # Sample output line from above cmd: ++ # 3: eth1 inet 10.0.2.10/24 scope global eth1 valid_lft forever ... ++ ifcfg = re.split(r'\s+', interface) ++ ifcfg_name = ifcfg[1] ++ ifcfg_ipaddr = ifcfg[3] ++ ++ # Filter out admin interface (device name is not known, match IP) ++ current_network = netaddr.IPNetwork(ifcfg_ipaddr) ++ if str(current_network.ip) == fuel['ADMIN_NETWORK']['ipaddress']: ++ continue ++ ++ # Read ifcfg-* network interface config file, write IFCFG_<IFNAME> ++ ifcfg_sec = 'IFCFG_%s' % ifcfg_name.upper() ++ fuel[ifcfg_sec] = {} ++ ifcfg_data = {} ++ ifcfg_f = ('/etc/sysconfig/network-scripts/ifcfg-%s' % ifcfg_name) ++ with open(ifcfg_f) as f: ++ for line in f: ++ (key, val) = line.split('=') ++ ifcfg_data[key.lower()] = val.rstrip() ++ ++ # Keep only needed info (e.g. filter-out type=Ethernet). ++ fuel[ifcfg_sec]['ipaddress'] = ifcfg_data['ipaddr'] ++ fuel[ifcfg_sec]['device'] = ifcfg_data['device'] ++ fuel[ifcfg_sec]['netmask'] = str(current_network.netmask) ++ fuel[ifcfg_sec]['gateway'] = ifcfg_data['gateway'] ++ + self.write_yaml(self.dea_file, {'fuel': fuel}) + + def reap_network_settings(self): diff --git a/upstream/fuel-astute b/upstream/fuel-astute new file mode 160000 +Subproject b81577a5b7857c4be8748492bae1dec2fa89b44 |