diff options
| -rw-r--r-- | .gitmodules | 4 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | docs/build-instruction.rst | 105 | ||||
| -rw-r--r-- | docs/index.rst | 6 | ||||
| -rw-r--r-- | patches/fuel-agent/0010-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch | 35 | ||||
| -rw-r--r-- | patches/fuel-astute/0001-Increase-maximum-shell-command-timeout.patch | 33 | ||||
| -rw-r--r-- | patches/fuel-library/0013-Allow-configuring-MySQL-WSREP-SST-provider.patch (renamed from patches/fuel-library/0014-Allow-configuring-MySQL-WSREP-SST-provider.patch) | 0 | ||||
| -rw-r--r-- | patches/fuel-library/0013-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch | 51 | ||||
| m--------- | upstream/fuel-astute | 0 |
9 files changed, 142 insertions, 94 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 \ 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-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch b/patches/fuel-agent/0010-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch new file mode 100644 index 00000000..b0c32f4f --- /dev/null +++ b/patches/fuel-agent/0010-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch @@ -0,0 +1,35 @@ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Mon, 9 May 2016 21:46:51 +0200 +Subject: [PATCH] target Ubuntu: Blacklist rtc-efi if not supported. + +Older ThunderX and possibly other UEFI-enabled targets do not support +rtc-efi properly, so they end up filling dmesg with useless +complaints about not being able to read system time. + +Target OS (Ubuntu) deployment already has a snippet that blacklists +i2c_piix4 in certain scenarios, so provide a similar test for rtc_efi. +--- + cloud-init-templates/boothook_fuel_7.0_ubuntu.jinja2 | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/cloud-init-templates/boothook_fuel_7.0_ubuntu.jinja2 b/cloud-init-templates/boothook_fuel_7.0_ubuntu.jinja2 +index 253be2d..9758376 100644 +--- a/cloud-init-templates/boothook_fuel_7.0_ubuntu.jinja2 ++++ b/cloud-init-templates/boothook_fuel_7.0_ubuntu.jinja2 +@@ -49,8 +49,14 @@ cloud-init-per instance resolv_conf_head_nameserver /bin/sh -c 'echo nameserver + # configure black module lists + # virt-what should be installed + if [ ! -f /etc/modprobe.d/blacklist-i2c_piix4.conf ]; then +- ( (virt-what | fgrep -q "virtualbox") && echo "blacklist i2c_piix4" >> /etc/modprobe.d/blacklist-i2c_piix4.conf || :) && update-initramfs -u -k all +- modprobe -r i2c_piix4 ++ ( (virt-what | fgrep -q "virtualbox") && \ ++ ( echo "blacklist i2c_piix4" >> /etc/modprobe.d/blacklist-i2c_piix4.conf && \ ++ update-initramfs -u -k all && modprobe -r i2c_piix4 ) || :) ++fi ++if [ ! -f /etc/modprobe.d/blacklist-rtc_efi.conf ]; then ++ ( /bin/cat /sys/class/rtc/rtc0/time > /dev/null 2>&1 ) || \ ++ ( echo "blacklist rtc_efi" >> /target/etc/modprobe.d/blacklist-rtc_efi.conf && \ ++ update-initramfs -u -k all && modprobe -r rtc_efi ) + fi + + cloud-init-per instance conntrack_ipv4 /bin/sh -c 'echo nf_conntrack_ipv4 | tee -a /etc/modules' 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/fuel-library/0014-Allow-configuring-MySQL-WSREP-SST-provider.patch b/patches/fuel-library/0013-Allow-configuring-MySQL-WSREP-SST-provider.patch index c7000ae8..c7000ae8 100644 --- a/patches/fuel-library/0014-Allow-configuring-MySQL-WSREP-SST-provider.patch +++ b/patches/fuel-library/0013-Allow-configuring-MySQL-WSREP-SST-provider.patch diff --git a/patches/fuel-library/0013-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch b/patches/fuel-library/0013-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch deleted file mode 100644 index cfc1f6cb..00000000 --- a/patches/fuel-library/0013-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch +++ /dev/null @@ -1,51 +0,0 @@ -From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Sun, 17 Apr 2016 17:53:46 +0200 -Subject: [PATCH] target Ubuntu: Blacklist rtc-efi if not supported. - -Older ThunderX and possibly other UEFI-enabled targets do not support -rtc-efi properly, so they end up filling dmesg with useless -complaints about not being able to read system time. - -Target OS (Ubuntu) deployment already has a snippet that blacklists -i2c_piix4 in certain scenarios, so provide a similar test for rtc_efi. - -update-initramfs is already invoked from i2c_piix4 snippet, so ommit -explicitly calling it in rtc_efi fragment. ---- - deployment/puppet/cobbler/manifests/snippets.pp | 1 + - deployment/puppet/cobbler/templates/preseed/ubuntu-1404.preseed.erb | 1 + - .../puppet/cobbler/templates/snippets/ubuntu_blacklist_rtc_efi.erb | 1 + - 3 files changed, 3 insertions(+) - create mode 100644 deployment/puppet/cobbler/templates/snippets/ubuntu_blacklist_rtc_efi.erb - -diff --git a/deployment/puppet/cobbler/manifests/snippets.pp b/deployment/puppet/cobbler/manifests/snippets.pp -index 46c76d0..5ab9a17 100644 ---- a/deployment/puppet/cobbler/manifests/snippets.pp -+++ b/deployment/puppet/cobbler/manifests/snippets.pp -@@ -58,6 +58,7 @@ class cobbler::snippets { - cobbler_snippet {"centos_static_net":} - cobbler_snippet {"ofed_install_with_sriov":} - cobbler_snippet {"ubuntu_authorized_keys":} -+ cobbler_snippet {"ubuntu_blacklist_rtc_efi":} - cobbler_snippet {"ubuntu_blacklist_i2c_piix4":} - cobbler_snippet {"ubuntu_disable_pxe":} - cobbler_snippet {"ubuntu_puppet_config":} -diff --git a/deployment/puppet/cobbler/templates/preseed/ubuntu-1404.preseed.erb b/deployment/puppet/cobbler/templates/preseed/ubuntu-1404.preseed.erb -index 65c6c69..8e17a0e 100644 ---- a/deployment/puppet/cobbler/templates/preseed/ubuntu-1404.preseed.erb -+++ b/deployment/puppet/cobbler/templates/preseed/ubuntu-1404.preseed.erb -@@ -177,6 +177,7 @@ echo target > /target/etc/nailgun_systemtype && \ - $SNIPPET('ubuntu_authorized_keys') - sed -i -e "/^\s*GSSAPICleanupCredentials yes/d" -e "/^\s*GSSAPIAuthentication yes/d" -e "s/.*PasswordAuthentication\ .*/PasswordAuthentication\ no/g" -e "/UseDNS/d" /target/etc/ssh/sshd_config && \ - echo "UseDNS no" >> /target/etc/ssh/sshd_config && \ -+$SNIPPET('ubuntu_blacklist_rtc_efi') - $SNIPPET('ubuntu_blacklist_i2c_piix4') - $SNIPPET('ubuntu_static_net') - $SNIPPET('ofed_install_with_sriov') -diff --git a/deployment/puppet/cobbler/templates/snippets/ubuntu_blacklist_rtc_efi.erb b/deployment/puppet/cobbler/templates/snippets/ubuntu_blacklist_rtc_efi.erb -new file mode 100644 -index 0000000..902f142 ---- /dev/null -+++ b/deployment/puppet/cobbler/templates/snippets/ubuntu_blacklist_rtc_efi.erb -@@ -0,0 +1 @@ -+( /bin/cat /sys/class/rtc/rtc0/time > /dev/null 2>&1 || echo "blacklist rtc_efi" >> /target/etc/modprobe.d/blacklist-rtc_efi.conf ) && \ diff --git a/upstream/fuel-astute b/upstream/fuel-astute new file mode 160000 +Subproject b81577a5b7857c4be8748492bae1dec2fa89b44 |