summaryrefslogtreecommitdiffstats
path: root/docs/installationprocedure/vmdeploy.rst
diff options
context:
space:
mode:
Diffstat (limited to 'docs/installationprocedure/vmdeploy.rst')
-rw-r--r--docs/installationprocedure/vmdeploy.rst38
1 files changed, 25 insertions, 13 deletions
diff --git a/docs/installationprocedure/vmdeploy.rst b/docs/installationprocedure/vmdeploy.rst
index cb5df6fb..54d7863e 100644
--- a/docs/installationprocedure/vmdeploy.rst
+++ b/docs/installationprocedure/vmdeploy.rst
@@ -10,7 +10,10 @@ Nodes Configuration (Virtual Deployment)
The below file is the inventory template of deployment nodes:
-"./deploy/conf/vm_environment/huawei-virtual1/network.yml"
+"./deploy/conf/vm_environment/huawei-virtual1/dha.yml"
+
+The "dha.yml" is a collectively name for "os-nosdn-nofeature-ha.yml
+os-ocl-nofeature-ha.yml os-odl_l2-moon-ha.yml etc".
You can write your own address/roles reference to it.
@@ -147,7 +150,7 @@ You can write your own reference to it.
Start Deployment (Virtual Deployment)
-------------------------------------
-1. Edit run.sh
+1. Edit deploy.sh
Set OS version and OpenStack version for deployment nodes.
Compass4nfv Colorado supports three OS version based openstack mitaka.
@@ -156,17 +159,26 @@ E.g.
.. code-block:: bash
- ########## Ubuntu14.04 Mitaka ##########
- export OS_VERSION=trusty
- export OPENSTACK_VERSION=mitaka
+ ######################### The environment for Openstack ######################
+ # Ubuntu16.04 Newton
+ #export OS_VERSION=xenial
+ #export OPENSTACK_VERSION=newton_xenial
+
+ # Ubuntu14.04 Mitaka
+ #export OS_VERSION=trusty
+ #export OPENSTACK_VERSION=mitaka
+
+ # Ubuntu16.04 Mitaka
+ #export OS_VERSION=xenial
+ #export OPENSTACK_VERSION=mitaka_xenial
- ########## Ubuntu16.04 Mitaka ##########
- # export OS_VERSION=xenial
- # export OPENSTACK_VERSION=mitaka_xenial
+ # Centos7 Mitaka
+ #export OS_VERSION=centos7
+ #export OPENSTACK_VERSION=mitaka
- ########## Centos7 Mitaka ##########
- # export OS_VERSION=centos7
- # export OPENSTACK_VERSION=mitaka
+ # Redhat7 OSP9
+ #export OS_VERSION=redhat7
+ #export OPENSTACK_VERSION=osp9
Set ISO image that you want to deploy
@@ -253,8 +265,8 @@ onos-sfc deploy scenario sample
# NETWORK is your network.yml's path
export NETWORK=./deploy/conf/vm_environment/huawei-virtual1/network_onos.yml
-2. Run ``run.sh``
+2. Run ``deploy.sh``
.. code-block:: bash
- ./run.sh
+ ./deploy.sh