From e71bd7124aea67df693d58dd8f534bf1ef8cb86c Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 26 Oct 2017 18:53:53 +0200 Subject: ci/deploy.sh: Add PDF parsing dependencies The following packages are required for PDF parsing: - python - python-ipaddress - python-jinja2 Note that `python-ipaddress` is not available on older Ubuntu distributions (e.g. Trusty), in which case `pip` should be used to install it. An alternative would be to use python3 packages. Update the installation instructions to specify minimum expected requirements on the jump server. JIRA: FUEL-292 Change-Id: I19fdcc163dcfdee45ac6fa3f5e09a28638d6035c Signed-off-by: Alexandru Avadanii (cherry picked from commit f10bc960eead6c1423ada006a383515279056886) --- ci/deploy.sh | 8 +++++++ .../installation/installation.instruction.rst | 28 ++++++++++++++++------ 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/ci/deploy.sh b/ci/deploy.sh index 97c4de0e3..787f7dee5 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -269,6 +269,14 @@ pushd "${DEPLOY_DIR}" > /dev/null [ -n "$(command -v yum)" ] && sudo yum install -y --skip-broken \ git make rsync genisoimage curl virt-install qemu-kvm util-linux +# For baremetal, python is indirectly required for PDF parsing +if [ "${DEPLOY_TYPE}" = 'baremetal' ]; then + [ -n "$(command -v apt-get)" ] && sudo apt-get install -y \ + python python-ipaddress python-jinja2 + [ -n "$(command -v yum)" ] && sudo yum install -y --skip-broken \ + python python-ipaddress python-jinja2 +fi + # Clone git submodules and apply our patches make -C "${REPO_ROOT_PATH}/mcp/patches" deepclean patches-import diff --git a/docs/release/installation/installation.instruction.rst b/docs/release/installation/installation.instruction.rst index 9b2c2e8c2..516b99afa 100644 --- a/docs/release/installation/installation.instruction.rst +++ b/docs/release/installation/installation.instruction.rst @@ -40,7 +40,7 @@ OPNFV, using Fuel as a deployment tool, some planning must be done. Preparations -================== +============ Prior to installation, a number of deployment specific parameters must be collected, those are: @@ -65,7 +65,7 @@ This information will be needed for the configuration procedures provided in this document. ========================================= -Hardware requirements for virtual deploys +Hardware Requirements for Virtual Deploys ========================================= The following minimum hardware requirements must be met for the virtual @@ -76,7 +76,7 @@ installation of Euphrates using Fuel: | | | +============================+========================================================+ | **1 Jumpserver** | A physical node (also called Foundation Node) that | -| | hosts a Salt Master VM and each of the VM nodes in | +| | will host a Salt Master VM and each of the VM nodes in | | | the virtual deploy | +----------------------------+--------------------------------------------------------+ | **CPU** | Minimum 1 socket with Virtualization support | @@ -88,7 +88,7 @@ installation of Euphrates using Fuel: =========================================== -Hardware requirements for baremetal deploys +Hardware Requirements for Baremetal Deploys =========================================== The following minimum hardware requirements must be met for the baremetal @@ -153,7 +153,7 @@ environment, you should think about: - Networking -- Depends on the Choose Network Topology, the network bandwidth per virtual machine, and network storage. ================================================ -Top of the rack (TOR) Configuration requirements +Top of the Rack (TOR) Configuration Requirements ================================================ The switching infrastructure provides connectivity for the OPNFV @@ -177,8 +177,22 @@ Manual configuration of the Euphrates hardware platform should be carried out according to the `OPNFV Pharos Specification `_. +============================ +OPNFV Software Prerequisites +============================ + +The Jumpserver node should be pre-provisioned with an operating system, +according to the Pharos specification. Relevant network bridges should +also be pre-configured (e.g. admin, management, public). + +Fuel@OPNFV has been validated by CI using the following distributions +installed on the Jumpserver: + + - CentOS 7 (recommended by Pharos specification); + - Ubuntu Xenial; + ========================================== -OPNFV Software installation and deployment +OPNFV Software Installation and Deployment ========================================== This section describes the process of installing all the components needed to @@ -224,7 +238,7 @@ The installation is done automatically with the deploy script, which will: - Leverage Salt to install & configure Openstack services -Steps to start the automatic deploy +Steps to Start the Automatic Deploy =================================== These steps are common both for virtual and baremetal deploys. -- cgit 1.2.3-korg