summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorMartin Kulhavy <martin.kulhavy@nokia.com>2017-08-09 16:08:40 +0300
committerMartin Kulhavy <martin.kulhavy@nokia.com>2017-08-10 14:03:14 +0300
commited47542253ad4a31af5d64b25a75c0e2d656836a (patch)
tree03832e4da231ee0764d65c5bcc2e6451e3225ff2 /ci
parent2f823d98d676b0465c01361f1ba942d14a3e974c (diff)
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 <martin.kulhavy@nokia.com>
Diffstat (limited to 'ci')
-rw-r--r--ci/README8
-rwxr-xr-xci/deploy.sh4
-rw-r--r--ci/genBundle.py2
3 files changed, 7 insertions, 7 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 b0aec737..8491ad45 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
@@ -26,7 +26,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: