From ed47542253ad4a31af5d64b25a75c0e2d656836a Mon Sep 17 00:00:00 2001 From: Martin Kulhavy Date: Wed, 9 Aug 2017 16:08:40 +0300 Subject: Change the deployment mode from 'nonha' to 'noha' To conform with the OPNFV scenario naming pattern, the mode of the scenario must be either 'ha' or 'noha'. Reference: https://wiki.opnfv.org/display/INF/CI+Scenario+Naming Change-Id: I99a2ffb40dd1e0f0d155af985498d27e00817188 Signed-off-by: Martin Kulhavy --- docs/release/configguide/installerconfig.rst | 14 +++++++------- docs/release/installation/installationprocedure.rst | 14 +++++++------- docs/release/scenarios/os-nosdn-lxd-ha/release-notes.rst | 2 +- docs/release/scenarios/os-nosdn-lxd-noha/release-notes.rst | 2 +- .../scenarios/os-nosdn-nofeature-ha/release-notes.rst | 2 +- .../scenarios/os-nosdn-nofeature-noha/release-notes.rst | 2 +- docs/release/userguide/userguide.rst | 4 ++-- 7 files changed, 20 insertions(+), 20 deletions(-) (limited to 'docs') diff --git a/docs/release/configguide/installerconfig.rst b/docs/release/configguide/installerconfig.rst index 8239ab6d..94ee56fe 100644 --- a/docs/release/configguide/installerconfig.rst +++ b/docs/release/configguide/installerconfig.rst @@ -188,7 +188,7 @@ https://gerrit.opnfv.org/gerrit/gitweb?p=joid.git;a=blob;f=labconfig/intel/pod6/ opnfv: release: d distro: xenial - type: nonha + type: noha openstack: newton sdncontroller: - type: nosdn @@ -244,10 +244,10 @@ When it's done, you should be able to view MAAS webpage (http:///MAAS) OPNFV Install ------------- -| ``   ./deploy.sh -o newton -s nosdn -t nonha -l custom -f none -d xenial -m openstack`` +| ``   ./deploy.sh -o newton -s nosdn -t noha -l custom -f none -d xenial -m openstack`` | ``   `` -./deploy.sh -o newton -s nosdn -t nonha -l custom -f none -d xenial -m openstack +./deploy.sh -o newton -s nosdn -t noha -l custom -f none -d xenial -m openstack NOTE: Possible options are as follows: @@ -259,8 +259,8 @@ choose which sdn controller to use. onos: ONOS framework as SDN. Mode of Openstack deployed. - [-t ] - nonha: NO HA mode of Openstack + [-t ] + noha: NO HA mode of Openstack ha: HA mode of openstack. Wihch version of Openstack deployed. @@ -302,8 +302,8 @@ os-nosdn-lxd-ha Joid Yardstick team is working to support. os-nosdn-lxd-noha Joid Yardstick team is working to support. os-onos-nofeature-ha ONOSFW os-onos-sfc-ha ONOSFW -k8-nosdn-nofeature-nonha Joid No support from Functest and Yardstick -k8-nosdn-lb-nonha Joid No support from Functest and Yardstick +k8-nosdn-nofeature-noha Joid No support from Functest and Yardstick +k8-nosdn-lb-noha Joid No support from Functest and Yardstick Is the deployment done successfully? ------------------------------------ diff --git a/docs/release/installation/installationprocedure.rst b/docs/release/installation/installationprocedure.rst index 98d0cb87..a61df2ca 100644 --- a/docs/release/installation/installationprocedure.rst +++ b/docs/release/installation/installationprocedure.rst @@ -184,7 +184,7 @@ https://gerrit.opnfv.org/gerrit/gitweb?p=joid.git;a=blob;f=labconfig/intel/pod6/ opnfv: release: d distro: xenial - type: nonha + type: noha openstack: newton sdncontroller: - type: nosdn @@ -228,10 +228,10 @@ For deployment of Danube release on KVM please use the following command. OPNFV Install ------------- -| ``   ./deploy.sh -o newton -s nosdn -t nonha -l custom -f none -d xenial -m openstack`` +| ``   ./deploy.sh -o newton -s nosdn -t noha -l custom -f none -d xenial -m openstack`` | ``   `` -./deploy.sh -o newton -s nosdn -t nonha -l custom -f none -d xenial -m openstack +./deploy.sh -o newton -s nosdn -t noha -l custom -f none -d xenial -m openstack NOTE: Possible options are as follows: @@ -243,8 +243,8 @@ choose which sdn controller to use. onos: ONOS framework as SDN. Mode of Openstack deployed. - [-t ] - nonha: NO HA mode of Openstack + [-t ] + noha: NO HA mode of Openstack ha: HA mode of openstack. Wihch version of Openstack deployed. @@ -286,8 +286,8 @@ os-nosdn-lxd-ha Joid Yardstick team is working to support. os-nosdn-lxd-noha Joid Yardstick team is working to support. os-onos-nofeature-ha ONOSFW os-onos-sfc-ha ONOSFW -k8-nosdn-nofeature-nonha Joid No support from Functest and Yardstick -k8-nosdn-lb-nonha Joid No support from Functest and Yardstick +k8-nosdn-nofeature-noha Joid No support from Functest and Yardstick +k8-nosdn-lb-noha Joid No support from Functest and Yardstick ------------ Troubleshoot diff --git a/docs/release/scenarios/os-nosdn-lxd-ha/release-notes.rst b/docs/release/scenarios/os-nosdn-lxd-ha/release-notes.rst index 2de73c24..96afbec0 100644 --- a/docs/release/scenarios/os-nosdn-lxd-ha/release-notes.rst +++ b/docs/release/scenarios/os-nosdn-lxd-ha/release-notes.rst @@ -52,7 +52,7 @@ command to deploy lxd feature is: ./deploy.sh -o newton -f lxd -t ha -l custom -s nosdn #LXD deployment with no HA Openstack -./deploy.sh -o newton -f lxd -t nonha -l custom -s nosdn +./deploy.sh -o newton -f lxd -t noha -l custom -s nosdn Using LXD with Openstack ======================== diff --git a/docs/release/scenarios/os-nosdn-lxd-noha/release-notes.rst b/docs/release/scenarios/os-nosdn-lxd-noha/release-notes.rst index 2de73c24..96afbec0 100644 --- a/docs/release/scenarios/os-nosdn-lxd-noha/release-notes.rst +++ b/docs/release/scenarios/os-nosdn-lxd-noha/release-notes.rst @@ -52,7 +52,7 @@ command to deploy lxd feature is: ./deploy.sh -o newton -f lxd -t ha -l custom -s nosdn #LXD deployment with no HA Openstack -./deploy.sh -o newton -f lxd -t nonha -l custom -s nosdn +./deploy.sh -o newton -f lxd -t noha -l custom -s nosdn Using LXD with Openstack ======================== diff --git a/docs/release/scenarios/os-nosdn-nofeature-ha/release-notes.rst b/docs/release/scenarios/os-nosdn-nofeature-ha/release-notes.rst index 1b520ff9..974b7981 100644 --- a/docs/release/scenarios/os-nosdn-nofeature-ha/release-notes.rst +++ b/docs/release/scenarios/os-nosdn-nofeature-ha/release-notes.rst @@ -51,7 +51,7 @@ command to deploy lxd feature is: ./deploy.sh -o newton -f none -t ha -l custom -s nosdn #LXD deployment with no HA Openstack -./deploy.sh -o newton -f none -t nonha -l custom -s nosdn +./deploy.sh -o newton -f none -t noha -l custom -s nosdn Using Openstack =============== diff --git a/docs/release/scenarios/os-nosdn-nofeature-noha/release-notes.rst b/docs/release/scenarios/os-nosdn-nofeature-noha/release-notes.rst index 1b520ff9..974b7981 100644 --- a/docs/release/scenarios/os-nosdn-nofeature-noha/release-notes.rst +++ b/docs/release/scenarios/os-nosdn-nofeature-noha/release-notes.rst @@ -51,7 +51,7 @@ command to deploy lxd feature is: ./deploy.sh -o newton -f none -t ha -l custom -s nosdn #LXD deployment with no HA Openstack -./deploy.sh -o newton -f none -t nonha -l custom -s nosdn +./deploy.sh -o newton -f none -t noha -l custom -s nosdn Using Openstack =============== diff --git a/docs/release/userguide/userguide.rst b/docs/release/userguide/userguide.rst index d010a488..7ef9d631 100644 --- a/docs/release/userguide/userguide.rst +++ b/docs/release/userguide/userguide.rst @@ -171,7 +171,7 @@ lab: opnfv: release: d distro: xenial - type: nonha + type: noha openstack: newton sdncontroller: - type: nosdn @@ -247,7 +247,7 @@ Take a look at the deploy.sh script. You will find we support the following for opencontrail: OpenContrail. onos: ONOS framework as SDN. [-t] - nonha: NO HA mode of OpenStack. + noha: NO HA mode of OpenStack. ha: HA mode of OpenStack. tip: The tip of the development. [-o] -- cgit 1.2.3-korg