From 0337ca28259e0afe67778c778c1cc8697cd93cec Mon Sep 17 00:00:00 2001 From: Yifei Xue Date: Fri, 1 Sep 2017 17:10:44 +0800 Subject: Update the documents for compass E release JIRA: - 1. Rewrite vm and bm deployment docs to satisfy the new release 2. add some images for network architecture 3. Update release name, version, etc. Change-Id: I1e9d305de5edf60d937868d49966c153d85fd2b5 Signed-off-by: Yifei Xue (cherry picked from commit 074eab95235e35431b0439e42d253d44b139004e) --- docs/release/installation/bmdeploy.rst | 159 +++------------------------------ 1 file changed, 14 insertions(+), 145 deletions(-) (limited to 'docs/release/installation/bmdeploy.rst') diff --git a/docs/release/installation/bmdeploy.rst b/docs/release/installation/bmdeploy.rst index 7bf40714..d584e938 100644 --- a/docs/release/installation/bmdeploy.rst +++ b/docs/release/installation/bmdeploy.rst @@ -199,7 +199,7 @@ IP Settings - ip_ranges -- ip addresses range provided for this network. - - cidr -- the IPv4 address and its associated routing prefix and subnet maskã + - cidr -- the IPv4 address and its associated routing prefix and subnet mask? - gw -- need to add this line only if network is external. @@ -226,11 +226,6 @@ Public VIP - interface -- mostly external. -ONOS NIC -~~~~~~~~ - - - the NIC for ONOS, if there is no ONOS configured, leave it unchanged. - Public Network ~~~~~~~~~~~~~~ @@ -316,127 +311,21 @@ Public Network **The following figure shows the interfaces and nics of JumpHost and deployment nodes in huawei-pod1 network configuration(default one nic for openstack networks).** -.. code-block:: console +.. figure:: images/single_nic.png + :alt: Single nic scenario + :figclass: align-center + Fig 1. Single nic scenario - +--------------JumpHost-------------+ - | | - | +-+Compass+-+ | - | | + +--------+ | External-network - | | eth2+---+br-ext +-+eth0+----------------------+ - | | + +--------+ | | - | | | | | - | | | | | - | | + +--------+ | Install-network | - | | eth1+---+install +-+eth1+-----------------+ | - | | + +--------+ | | | - | | | | | | - | | | | | | - | | + | IPMI-network | | - | | eth0 eth2+-----------+ | | - | | + | | | | - | +---+VM+----+ | | | | - +-----------------------------------+ | | | - | | | - | | | - | | | - | | | - +---------------Host1---------------+ | | | - | | | | | - | eth0+----------------+ | - | | | | | - | mgmt +--------+ | | | | - | | | | | | - | +-----------+ | | | | | - | external+----+ br-prv +----+eth1+---------------------+ - | +-----------+ | | | | | - | | | | | | - | storage +-----+ | | | | - | | | | | - +-----------------------------------+ | | | - | IPMI+-----------+ | | - +-----------------------------------+ | | | - | | | - | | | - | | | - +---------------Host2---------------+ | | | - | | | | | - | eth0+----------------+ | - | | | | - | mgmt +--------+ | | | - | | | | | - | +-----------+ | | | | - | external+----+ br-prv +----+eth1+---------------------+ - | +-----------+ | | | - | | | | - | storage +-----+ | | - | | | - +-----------------------------------+ | - | IPMI+-----------+ - +-----------------------------------+ **The following figure shows the interfaces and nics of JumpHost and deployment nodes in intel-pod8 network configuration(openstack networks are seperated by multiple NICs).** -.. code-block:: console - +.. figure:: images/multi_nics.png + :alt: Multiple nics scenario + :figclass: align-center - +-------------+JumpHost+------------+ - | | - | +-+Compass+-+ | - | | + +--------+ | External-network - | | eth2+---+br-ext +-+eth0+----------------------+ - | | + +--------+ | | - | | | | | - | | | | | - | | + +--------+ | Install-network | - | | eth1+---+install +-+eth1+-----------------+ | - | | + +--------+ | | | - | | | | | | - | | | | | | - | | + | IPMI-network | | - | | eth0 eth2+-----------+ | | - | | + | | | | - | +---+VM+----+ | | | | - +-----------------------------------+ | | | - | | | - | | | - | | | - | | | - +--------------+Host1+--------------+ | | | - | | | | | - | eth0+----------------+ | - | | | | | - | +--------+ | | | | - | external+----+br-prv +-+eth1+---------------------+ - | +--------+ | | | | - | storage +---------------+eth2+-------------------------+ - | | | | | | - | Mgmt +---------------+eth3+----------------------------+ - | | | | | | | - | | | | | | | - +-----------------------------------+ | | | | | - | IPMI+-----------+ | | | | - +-----------------------------------+ | | | | | - | | | | | - | | | | | - | | | | | - | | | | | - +--------------+Host2+--------------+ | | | | | - | | | | | | | - | eth0+----------------+ | | | - | | | | | | - | +--------+ | | | | | - | external+----+br-prv +-+eth1+---------------------+ | | - | +--------+ | | | | - | storage +---------------+eth2+-------------------------+ | - | | | storage-network | - | Mgmt +---------------+eth3+----------------------------+ - | | | mgmt-network - | | | - +-----------------------------------+ | - | IPMI+-----------+ - +-----------------------------------+ + Fig 2. Multiple nics scenario Start Deployment (Bare Metal Deployment) @@ -457,14 +346,14 @@ E.g. or export OS_VERSION=centos7 -1.2. Set ISO image corresponding to your code +1.2. Set tarball corresponding to your code E.g. .. code-block:: bash # Set ISO image corresponding to your code - export ISO_URL=file:///home/compass/compass4nfv.iso + export ISO_URL=file:///home/compass/compass4nfv.tar.gz 1.3. Set hardware deploy jumpserver PXE NIC. (set eth1 E.g.) You do not need to set it when virtual deploy. @@ -491,16 +380,6 @@ nosdn-nofeature scenario deploy sample # NETWORK is your network.yml's path export NETWORK=./deploy/conf/hardware_environment/huawei-pod1/network.yml -ocl-nofeature scenario deploy sample - -.. code-block:: bash - - # DHA is your dha.yml's path - export DHA=./deploy/conf/hardware_environment/huawei-pod1/os-ocl-nofeature-ha.yml - - # NETWORK is your network.yml's path - export NETWORK=./deploy/conf/hardware_environment/huawei-pod1/network_ocl.yml - odl_l2-moon scenario deploy sample .. code-block:: bash @@ -531,25 +410,15 @@ odl_l3-nofeature scenario deploy sample # NETWORK is your network.yml's path export NETWORK=./deploy/conf/hardware_environment/huawei-pod1/network.yml -onos-nofeature scenario deploy sample - -.. code-block:: bash - - # DHA is your dha.yml's path - export DHA=./deploy/conf/hardware_environment/huawei-pod1/os-onos-nofeature-ha.yml - - # NETWORK is your network.yml's path - export NETWORK=./deploy/conf/hardware_environment/huawei-pod1/network_onos.yml - -onos-sfc deploy scenario sample +odl-sfc deploy scenario sample .. code-block:: bash # DHA is your dha.yml's path - export DHA=./deploy/conf/hardware_environment/huawei-pod1/os-onos-sfc-ha.yml + export DHA=./deploy/conf/hardware_environment/huawei-pod1/os-odl-sfc-ha.yml # NETWORK is your network.yml's path - export NETWORK=./deploy/conf/hardware_environment/huawei-pod1/network_onos.yml + export NETWORK=./deploy/conf/hardware_environment/huawei-pod1/network.yml 2. Run ``deploy.sh`` -- cgit 1.2.3-korg