Revert "[docs] Update on Yardstick installation"

The changes to install.yml were limited to Ubuntu 18.
This doc update was not needed in Gambia

This reverts commit ddeab7c51942b19c1c88efe58339964afca941bc.

Change-Id: I79e02bbf77496e3b856ce039cb9e21b48b981777
Signed-off-by: Emma Foley <emma.l.foley@intel.com>

diff --git a/docs/testing/user/userguide/04-installation.rst b/docs/testing/user/userguide/04-installation.rst
index 2f8175c..672cc28 100644 (file)
--- a/docs/testing/user/userguide/04-installation.rst
+++ b/docs/testing/user/userguide/04-installation.rst
@@ -455,115 +455,6 @@ These configuration files can be found in the ``samples`` directory.
 Default location for the output is ``/tmp/yardstick.out``.
 
 
-Automatic installation of Yardstick using ansible
--------------------------------------------------
-
-Automatic installation can be used as an alternative to the manual.
-Yardstick can be installed on the bare metal and to the container. Yardstick
-container can be either pulled or built.
-
-Bare metal installation
-^^^^^^^^^^^^^^^^^^^^^^^
-
-Use ansible script ``install.yaml`` to install Yardstick on Ubuntu server:
-
-.. code-block:: console
-
-    ansible-playbook -i install-inventory.ini install.yaml \
-    -e YARDSTICK_DIR=<path to Yardstick folder>
-
-.. note:: By default ``INSTALLATION_MODE`` is ``baremetal``.
-
-.. note:: By default Ubuntu 16.04 is chosen (xenial). It can be changed to
-   Ubuntu 18.04 (bionic) by passing ``-e OS_RELEASE=bionic`` parameter.
-
-.. note:: To install Yardstick in virtual environment pass parameter
-   ``-e VIRTUAL_ENVIRONMENT=True``.
-
-To build Yardstick NSB image pass ``IMG_PROPERTY=nsb`` as input parameter:
-
-.. code-block:: console
-
-    ansible-playbook -i install-inventory.ini install.yaml \
-    -e IMAGE_PROPERTY=nsb \
-    -e YARDSTICK_DIR=<path to Yardstick folder>
-
-.. note:: In this ``INSTALLATION_MODE`` mode either Yardstick image or SampleVNF
-   images will be built. Image type is defined by parameter ``IMAGE_PROPERTY``.
-   By default Yardstick image will be built.
-
-Container installation
-^^^^^^^^^^^^^^^^^^^^^^
-
-Use ansible script ``install.yaml`` to pull or build Yardstick
-container. To pull Yardstick image and start container run:
-
-.. code-block:: console
-
-    ansible-playbook -i install-inventory.ini install.yaml \
-    -e YARDSTICK_DIR=<path to Yardstick folder> \
-    -e INSTALLATION_MODE=container_pull
-
-.. note:: In this ``INSTALLATION_MODE`` mode either Yardstick image or SampleVNF
-   images will be built. Image type is defined by variable ``IMG_PROPERTY`` in
-   file ``ansible/group_vars/all.yml``. By default Yardstick image will be
-   built.
-
-.. note:: Open question: How to know if Docker image is built on Ubuntu 16.04 and 18.04?
-   Do we need separate tag to be used?
-
-To build Yardstick image run:
-
-.. code-block:: console
-
-    ansible-playbook -i install-inventory.ini install.yaml \
-    -e YARDSTICK_DIR=<path to Yardstick folder> \
-    -e INSTALLATION_MODE=container
-
-.. note:: In this ``INSTALLATION_MODE`` mode neither Yardstick image nor SampleVNF
-   image will be built.
-
-.. note:: By default Ubuntu 16.04 is chosen (xenial). It can be changed to
-   Ubuntu 18.04 (bionic) by passing ``-e OS_RELEASE=bionic`` parameter.
-
-Parameters for ``install.yaml``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Description of the parameters used with ``install.yaml`` script
-
-  +-------------------------+-------------------------------------------------+
-  | Parameters              | Detail                                          |
-  +=========================+=================================================+
-  | -i install-inventory.ini| Installs package dependency to remote servers   |
-  |                         | Mandatory parameter                             |
-  |                         | By default no remote servers are provided       |
-  |                         | Needed packages will be installed on localhost  |
-  +-------------------------+-------------------------------------------------+
-  | -e YARDSTICK_DIR        | Path to Yardstick folder                        |
-  |                         | Mandatory parameter                             |
-  +-------------------------+-------------------------------------------------+
-  | -e INSTALLATION_MODE    | baremetal: Yardstick is installed to the bare   |
-  |                         | metal                                           |
-  |                         | Default parameter                               |
-  |                         +-------------------------------------------------+
-  |                         | container: Yardstick is installed in container  |
-  |                         | Container is built from Dockerfile              |
-  |                         +-------------------------------------------------+
-  |                         | container_pull: Yardstick is installed in       |
-  |                         | container                                       |
-  |                         | Container is pulled from docker hub             |
-  +-------------------------+-------------------------------------------------+
-  | -e OS_RELEASE           | xenial or bionic: Ubuntu version to be used     |
-  |                         | Default is Ubuntu 16.04 (xenial)                |
-  +-------------------------+-------------------------------------------------+
-  | -e IMAGE_PROPERTY       | normal or nsb: Type of the VM image to be built |
-  |                         | Default image is Yardstick                      |
-  +-------------------------+-------------------------------------------------+
-  | -e VIRTUAL_ENVIRONMENT  | False or True: Whether install in virtualenv    |
-  |                         | Default is False                                |
-  +-------------------------+-------------------------------------------------+
-
-
 Deploy InfluxDB and Grafana using Docker
 ----------------------------------------
 

diff --git a/docs/testing/user/userguide/13-nsb-installation.rst b/docs/testing/user/userguide/13-nsb-installation.rst
index 973d566..8b1f05d 100644 (file)
--- a/docs/testing/user/userguide/13-nsb-installation.rst
+++ b/docs/testing/user/userguide/13-nsb-installation.rst
@@ -179,10 +179,6 @@ It will also automatically download all the packages needed for NSB Testing
 setup. Refer chapter :doc:`04-installation` for more on docker
 **Install Yardstick using Docker (recommended)**
 
-Another way to execute an installation for a Bare-Metal or a Standalone context
-is to use ansible script ``install.yaml``. Refer chapter :doc:`04-installation`
-for more details.
-
 System Topology
 ---------------