diff options
-rw-r--r-- | build/Makefile | 5 | ||||
-rw-r--r-- | docs/installation-instruction.rst | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/build/Makefile b/build/Makefile index ca704c0c0..7e4d5a09d 100644 --- a/build/Makefile +++ b/build/Makefile @@ -82,9 +82,8 @@ all: @make -C docker @lsb_release -a | grep Ubuntu > /dev/null 2>&1 || (echo 'Ubuntu is the only supported Linux distribution for this build system'; exit 1) @KERNEL_VER=$$(uname -r); \ - KERNEL_VER="$${KERNEL_VER%.*-*}"; \ - KERNEL_VER="$${KERNEL_VER//.}"; \ - [ $$KERNEL_VER -ge 319 ] || (echo 'Kernel version must be 3.19 or newer'; exit 1) + KERNEL_ARRAY=($${KERNEL_VER//./ }); \ + if [ $${KERNEL_ARRAY[0]} -lt 3 ] || [[ $${KERNEL_ARRAY[0]} -eq 3 && $${KERNEL_ARRAY[1]} -lt 19 ]] ; then (echo 'Kernel version must be 3.19 or newer'; exit 1) ; fi @docker/runcontext $(DOCKERIMG) wget -q www.google.com > /dev/null 2>&1 || (echo 'No docker network connectivity or name server - check your network- and docker settings'; exit 1) @docker/runcontext $(DOCKERIMG) $(MAKE) $(MAKEFLAGS) iso diff --git a/docs/installation-instruction.rst b/docs/installation-instruction.rst index 8f64462e3..05f8bd0cb 100644 --- a/docs/installation-instruction.rst +++ b/docs/installation-instruction.rst @@ -51,7 +51,7 @@ Building the ISO image Alternatively, you may build the Fuel .iso from source by cloning the opnfv/fuel git repository. To retrieve the repository for the Brahmaputra release use the following command: -$git clone https://<linux foundation uid>@gerrit.opnf.org/gerrit/fuel +$ git clone https://gerrit.opnfv.org/gerrit/fuel Check-out the Brahmaputra release tag to set the branch to the baseline required to replicate the Brahmaputra release: @@ -335,7 +335,7 @@ Create an OpenStack Environment #. Select "additional services" you wish to install. - - Check option "Install Celiometer (OpenStack Telemetry)" and press <Next> + - Check option "Install Ceilometer (OpenStack Telemetry)" and press <Next> #. Create the new environment. |