diff options
| -rwxr-xr-x | ci/deploy.sh | 8 | ||||
| -rw-r--r-- | docs/release/installation/installation.instruction.rst | 30 |
2 files changed, 26 insertions, 12 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index fd41be85d..10b639e3c 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -90,7 +90,10 @@ $(notify_i "Input parameters to the build script are:" 2) -h Print this message and exit -L Deployment log path and name, eg. -L /home/jenkins/job.log.tar.gz -l Lab name as defined in the configuration directory, e.g. lf + For the sample configuration in <./mcp/config>, lab name is 'local'. -p POD name as defined in the configuration directory, e.g. pod2 + For the sample configuration in <./mcp/config>, POD name is 'virtual1' + for virtual deployments or 'pod1' for baremetal (based on lf-pod2). -N Experimental: Instead of virtualizing the control plane (VCP), deploy control plane directly on baremetal nodes -P Skip installing dependency distro packages on current host @@ -187,11 +190,6 @@ do ;; p) TARGET_POD=${OPTARG} - if [[ "${TARGET_POD}" =~ virtual ]]; then - # All vPODs will use 'local-virtual1' PDF/IDF for now - TARGET_LAB='local' - TARGET_POD='virtual1' - fi ;; P) USE_EXISTING_PKGS=1 diff --git a/docs/release/installation/installation.instruction.rst b/docs/release/installation/installation.instruction.rst index 94d67c193..a90a10d48 100644 --- a/docs/release/installation/installation.instruction.rst +++ b/docs/release/installation/installation.instruction.rst @@ -228,8 +228,8 @@ create a new sources list file `/apt/sources.list.d/armband.list` with the follo .. code-block:: bash $ cat /etc/apt/sources.list.d/armband.list - //for OpenStack Pike release - deb http://linux.enea.com/mcp-repos/pike/xenial pike-armband main + //for OpenStack Queens release + deb http://linux.enea.com/mcp-repos/queens/xenial queens-armband main $ apt-get update @@ -412,6 +412,11 @@ These steps are common both for virtual and baremetal deploys. -D \ -S <Storage directory for disk images> |& tee deploy.log + **NOTE**: The deployment uses the OPNFV Pharos project as input (PDF and IDF files) + for hardware and network configuration of all current OPNFV PODs. + When deploying a new POD, one can pass the `-b` flag to the deploy script to override + the path for the labconfig directory structure containing the PDF and IDF (see below). + Examples -------- #. Virtual deploy @@ -434,6 +439,19 @@ Examples available at http://<controller VIP>:8078 The administrator credentials are **admin** / **opnfv_secret**. + A simple (and generic) sample PDF/IDF set of configuration files may + be used for virtual deployments by setting lab/POD name to 'local-virtual1'. + This sample configuration is x86_64 specific and hardcodes certain parameters, + like public network address space, so a dedicated PDF/IDF is highly recommended. + + .. code-block:: bash + + $ ci/deploy.sh -l local \ + -p virtual1 \ + -s os-nosdn-nofeature-noha \ + -D \ + -S /home/jenkins/tmpdir |& tee deploy.log + #. Baremetal deploy A x86 deploy on pod2 from Linux Foundation lab @@ -471,10 +489,8 @@ Examples Once the deployment is complete, the SaltStack Deployment Documentation is available at http://<proxy public VIP>:8090 -**NOTE**: The deployment uses the OPNFV Pharos project as input (PDF and IDF files) -for hardware and network configuration of all current OPNFV PODs. -When deploying a new POD, one can pass the `-b` flag to the deploy script to override -the path for the labconfig directory structure containing the PDF and IDF. + When deploying a new POD, one can pass the `-b` flag to the deploy script to override + the path for the labconfig directory structure containing the PDF and IDF. .. code-block:: bash @@ -582,7 +598,7 @@ OPNFV OpenStack -4) `OpenStack Pike Release Artifacts <http://www.openstack.org/software/pike>`_ +4) `OpenStack Queens Release Artifacts <http://www.openstack.org/software/queens>`_ 5) `OpenStack Documentation <http://docs.openstack.org>`_ OpenDaylight |