summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2017-08-10 11:18:33 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-08-10 11:18:33 +0000
commit59cbeb8c0fbf4f8825cf741ed1863b1a4a3bdf00 (patch)
treee42bd91286542c2d819dd343f422fc2b389ea01e
parent25503476bf12d2c9b995bdcfbd61b072ecd7f0b6 (diff)
parented47542253ad4a31af5d64b25a75c0e2d656836a (diff)
Merge "Change the deployment mode from 'nonha' to 'noha'"
-rw-r--r--ci/README8
-rwxr-xr-xci/deploy.sh4
-rw-r--r--ci/genBundle.py2
-rw-r--r--docs/release/configguide/installerconfig.rst14
-rw-r--r--docs/release/installation/installationprocedure.rst14
-rw-r--r--docs/release/scenarios/os-nosdn-lxd-ha/release-notes.rst2
-rw-r--r--docs/release/scenarios/os-nosdn-lxd-noha/release-notes.rst2
-rw-r--r--docs/release/scenarios/os-nosdn-nofeature-ha/release-notes.rst2
-rw-r--r--docs/release/scenarios/os-nosdn-nofeature-noha/release-notes.rst2
-rw-r--r--docs/release/userguide/userguide.rst4
-rw-r--r--labconfig/att/virpod1/labconfig.yaml2
-rw-r--r--labconfig/cengn/pod1/labconfig.yaml2
-rw-r--r--labconfig/cengn/pod2/labconfig.yaml2
-rw-r--r--labconfig/default/labconfig.yaml2
-rw-r--r--labconfig/huawei/pod12/labconfig.yaml2
-rw-r--r--labconfig/intel/pod21/labconfig.yaml2
-rw-r--r--labconfig/intel/pod5/labconfig.yaml2
-rw-r--r--labconfig/intel/pod6/labconfig.yaml2
-rw-r--r--labconfig/intel/pod9/labconfig.yaml2
-rw-r--r--labconfig/labconfig.yaml2
-rw-r--r--labconfig/orange/pod1/labconfig.yaml2
-rw-r--r--labconfig/orange/pod2/labconfig.yaml2
22 files changed, 39 insertions, 39 deletions
diff --git a/ci/README b/ci/README
index 35d27ac8..39ed04c9 100644
--- a/ci/README
+++ b/ci/README
@@ -38,11 +38,11 @@ git clone https://gerrit.opnfv.org/gerrit/joid.git
copy the environments.yaml file from ~/.juju/ to joid/ci/
-# to deploy odl with mitaka in nonha mode
-./deploy.sh -s odl -o mitaka -t nonha
+# to deploy odl with mitaka in noha mode
+./deploy.sh -s odl -o mitaka -t noha
-# to deploy opencontail with liberty in nonha mode
-./deply.sh -s opencontrail -o liberty -t nonha
+# to deploy opencontail with liberty in noha mode
+./deply.sh -s opencontrail -o liberty -t noha
NOTE: Wait for approximately 30-45 minutes and your openstack will be ready to use.
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 94c7b416..15229e60 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -6,7 +6,7 @@ set -ex
# Below parameters are the default and we can according the release
opnfvsdn=nosdn
-opnfvtype=nonha
+opnfvtype=noha
openstack=ocata
opnfvlab=default
opnfvrel=e
@@ -27,7 +27,7 @@ read_config() {
}
usage() { echo "Usage: $0 [-s <nosdn|odl|opencontrail>]
- [-t <nonha|ha|tip>]
+ [-t <noha|ha|tip>]
[-o <juno|liberty>]
[-l <default|intelpod5>]
[-f <ipv6,dpdk,lxd,dvr>]
diff --git a/ci/genBundle.py b/ci/genBundle.py
index b70b29a3..78dfae04 100644
--- a/ci/genBundle.py
+++ b/ci/genBundle.py
@@ -143,7 +143,7 @@ for storage in config['opnfv']['storage']:
# Set default scenario name
if not scenario:
- scenario = "os-nosdn-nofeature-nonha"
+ scenario = "os-nosdn-nofeature-noha"
# Parse scenario name
try:
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 IP>/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|ha|tip>]
- nonha: NO HA mode of Openstack
+ [-t <noha|ha|tip>]
+ 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|ha|tip>]
- nonha: NO HA mode of Openstack
+ [-t <noha|ha|tip>]
+ 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]
diff --git a/labconfig/att/virpod1/labconfig.yaml b/labconfig/att/virpod1/labconfig.yaml
index 502aec7a..03914396 100644
--- a/labconfig/att/virpod1/labconfig.yaml
+++ b/labconfig/att/virpod1/labconfig.yaml
@@ -30,7 +30,7 @@ lab:
opnfv:
release: c
distro: trusty
- type: nonha
+ type: noha
openstack: mitaka
sdncontroller:
- type: nosdn
diff --git a/labconfig/cengn/pod1/labconfig.yaml b/labconfig/cengn/pod1/labconfig.yaml
index 874542ed..3a33a7e8 100644
--- a/labconfig/cengn/pod1/labconfig.yaml
+++ b/labconfig/cengn/pod1/labconfig.yaml
@@ -100,7 +100,7 @@ lab:
opnfv:
release: c
distro: xenial
- type: nonha
+ type: noha
openstack: mitaka
sdncontroller:
- type: nosdn
diff --git a/labconfig/cengn/pod2/labconfig.yaml b/labconfig/cengn/pod2/labconfig.yaml
index 5523183b..f233ab52 100644
--- a/labconfig/cengn/pod2/labconfig.yaml
+++ b/labconfig/cengn/pod2/labconfig.yaml
@@ -117,7 +117,7 @@ lab:
opnfv:
release: c
distro: trusty
- type: nonha
+ type: noha
openstack: liberty
sdncontroller:
- type: nosdn
diff --git a/labconfig/default/labconfig.yaml b/labconfig/default/labconfig.yaml
index 48d2952c..60df92c3 100644
--- a/labconfig/default/labconfig.yaml
+++ b/labconfig/default/labconfig.yaml
@@ -33,7 +33,7 @@ lab:
opnfv:
release: d
distro: xenial
- type: nonha
+ type: noha
openstack: newton
sdncontroller:
- type: nosdn
diff --git a/labconfig/huawei/pod12/labconfig.yaml b/labconfig/huawei/pod12/labconfig.yaml
index fb9ebc53..c78a056b 100644
--- a/labconfig/huawei/pod12/labconfig.yaml
+++ b/labconfig/huawei/pod12/labconfig.yaml
@@ -101,7 +101,7 @@ lab:
opnfv:
release: d
distro: xenial
- type: nonha
+ type: noha
openstack: newton
sdncontroller:
- type: nosdn
diff --git a/labconfig/intel/pod21/labconfig.yaml b/labconfig/intel/pod21/labconfig.yaml
index c0292d9a..f68770d0 100644
--- a/labconfig/intel/pod21/labconfig.yaml
+++ b/labconfig/intel/pod21/labconfig.yaml
@@ -148,7 +148,7 @@ lab:
opnfv:
release: d
distro: xenial
- type: nonha
+ type: noha
openstack: ocata
sdncontroller:
- type: nosdn
diff --git a/labconfig/intel/pod5/labconfig.yaml b/labconfig/intel/pod5/labconfig.yaml
index c0292d9a..f68770d0 100644
--- a/labconfig/intel/pod5/labconfig.yaml
+++ b/labconfig/intel/pod5/labconfig.yaml
@@ -148,7 +148,7 @@ lab:
opnfv:
release: d
distro: xenial
- type: nonha
+ type: noha
openstack: ocata
sdncontroller:
- type: nosdn
diff --git a/labconfig/intel/pod6/labconfig.yaml b/labconfig/intel/pod6/labconfig.yaml
index 9682aca8..8dcb1af3 100644
--- a/labconfig/intel/pod6/labconfig.yaml
+++ b/labconfig/intel/pod6/labconfig.yaml
@@ -119,7 +119,7 @@ lab:
opnfv:
release: c
distro: trusty
- type: nonha
+ type: noha
openstack: liberty
sdncontroller:
- type: nosdn
diff --git a/labconfig/intel/pod9/labconfig.yaml b/labconfig/intel/pod9/labconfig.yaml
index 6b90e819..824a48a4 100644
--- a/labconfig/intel/pod9/labconfig.yaml
+++ b/labconfig/intel/pod9/labconfig.yaml
@@ -118,7 +118,7 @@ lab:
opnfv:
release: c
distro: trusty
- type: nonha
+ type: noha
openstack: liberty
sdncontroller:
- type: nosdn
diff --git a/labconfig/labconfig.yaml b/labconfig/labconfig.yaml
index 0b9b266b..07a8a156 100644
--- a/labconfig/labconfig.yaml
+++ b/labconfig/labconfig.yaml
@@ -84,7 +84,7 @@ lab:
opnfv:
release: c
distro: trusty
- type: nonha
+ type: noha
openstack: liberty
sdncontroller:
- type: nosdn
diff --git a/labconfig/orange/pod1/labconfig.yaml b/labconfig/orange/pod1/labconfig.yaml
index 205700c6..70d2e556 100644
--- a/labconfig/orange/pod1/labconfig.yaml
+++ b/labconfig/orange/pod1/labconfig.yaml
@@ -101,7 +101,7 @@ lab:
opnfv:
release: c
distro: xenial
- type: nonha
+ type: noha
openstack: mitaka
sdncontroller:
- type: odl
diff --git a/labconfig/orange/pod2/labconfig.yaml b/labconfig/orange/pod2/labconfig.yaml
index c0d03daa..e9025edf 100644
--- a/labconfig/orange/pod2/labconfig.yaml
+++ b/labconfig/orange/pod2/labconfig.yaml
@@ -125,7 +125,7 @@ lab:
opnfv:
release: c
distro: xenial
- type: nonha
+ type: noha
openstack: newton
sdncontroller:
- type: nosdn