summaryrefslogtreecommitdiffstats
path: root/docs/installationprocedure/bmdeploy.rst
diff options
context:
space:
mode:
authorliyuenan <liyuenan@huawei.com>2016-11-01 11:36:27 +0800
committerliyuenan <liyuenan@huawei.com>2016-11-03 16:13:55 +0800
commitdbbb61368932e724f8aae720e1de53ae5c4eebf3 (patch)
tree34dafa2e2e29e7a5bc450fd3af83d4db05bbfa1f /docs/installationprocedure/bmdeploy.rst
parentde648f81d362c57a983600b4ce4401c9c14da2f9 (diff)
Edit the deploy.sh
Change-Id: I611abbd6a1265fc397c8af4f2131e5e073ad91bb Signed-off-by: liyuenan <liyuenan@huawei.com>
Diffstat (limited to 'docs/installationprocedure/bmdeploy.rst')
-rw-r--r--docs/installationprocedure/bmdeploy.rst36
1 files changed, 24 insertions, 12 deletions
diff --git a/docs/installationprocedure/bmdeploy.rst b/docs/installationprocedure/bmdeploy.rst
index 6ec70fa4..3b294f1f 100644
--- a/docs/installationprocedure/bmdeploy.rst
+++ b/docs/installationprocedure/bmdeploy.rst
@@ -12,6 +12,9 @@ The below file is the inventory template of deployment nodes:
"compass4nfv/deploy/conf/hardware_environment/huawei-pod1/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 IPMI IP/User/Password/Mac address/roles reference to it.
- name -- Host name for deployment node after installation.
@@ -205,7 +208,7 @@ You can write your own reference to it.
Start Deployment (Bare Metal 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.
@@ -214,17 +217,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
@@ -321,8 +333,8 @@ onos-sfc deploy scenario sample
# NETWORK is your network.yml's path
export NETWORK=./deploy/conf/hardware_environment/huawei-pod1/network_onos.yml
-2. Run ``run.sh``
+2. Run ``deploy.sh``
.. code-block:: bash
- ./run.sh
+ ./deploy.sh