diff options
| -rwxr-xr-x | ci/deploy/deploy.sh | 23 | ||||
| -rw-r--r-- | deploy/daisy_server.py | 7 | ||||
| -rw-r--r-- | docs/developer/design/index.rst | 16 | ||||
| -rw-r--r-- | docs/installationprocedure/index.rst | 8 | ||||
| -rw-r--r-- | docs/releasenotes/index.rst | 6 | ||||
| -rw-r--r-- | docs/releasenotes/release-notes.rst | 129 |
6 files changed, 178 insertions, 11 deletions
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh index e2923a1d..d01d3509 100755 --- a/ci/deploy/deploy.sh +++ b/ci/deploy/deploy.sh @@ -40,7 +40,7 @@ Examples: sudo `basename $0` -b base_path -l zte -p pod2 -B pxebr -d ./deploy/config/vm_environment/zte-virtual1/deploy.yml - -r /opt/daisy -w /opt/daisy + -r /opt/daisy -w /opt/daisy -s os-nosdn-nofeature-noha xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx EOF } @@ -63,6 +63,7 @@ TARGET_HOSTS_NUM=0 DRY_RUN=0 IS_BARE=1 VM_MULTINODE=("computer01" "computer02" "computer03" "computer04" "controller01") +VALID_DEPLOY_SCENARIO=("os-nosdn-nofeature-noha" "os-odl_l3-nofeature-noha" "os-odl_l2-nofeature-noha") # # END of variables to customize ############################################################################ @@ -181,6 +182,7 @@ if [ $DRY_RUN -eq 1 ]; then VMDEPLOY_TARGET_NODE_NET: $VMDEPLOY_TARGET_NODE_NET VMDEPLOY_DAISY_SERVER_VM: $VMDEPLOY_DAISY_SERVER_VM VMDEPLOY_TARGET_NODE_VM: $VMDEPLOY_TARGET_NODE_VM + DEPLOY_SCENARIO: $DEPLOY_SCENARIO """ exit 1 fi @@ -195,6 +197,25 @@ fi test -d ${VM_STORAGE} || mkdir -p ${VM_STORAGE} +function check_scenario_arg +{ + local is_valid_scenario=0 + + for item in ${VALID_DEPLOY_SCENARIO[@]};do + if [ ${DEPLOY_SCENARIO} == $item ]; then + is_valid_scenario=1 + break + fi + done + + if [ $is_valid_scenario -eq 0 ]; then + echo "Invalid scenario argument:${DEPLOY_SCENARIO}" + exit 1 + fi +} + +check_scenario_arg + function create_node { local net_template=$1 diff --git a/deploy/daisy_server.py b/deploy/daisy_server.py index 223b2b1c..eb711afd 100644 --- a/deploy/daisy_server.py +++ b/deploy/daisy_server.py @@ -209,10 +209,11 @@ class DaisyServer(object): if self.adapter != 'libvirt': return LI('Prepare some configuration files') - cmd = 'export PYTHONPATH={python_path}; python {script} -nw {net_file}'.format( + cmd = 'export PYTHONPATH={python_path}; python {script} -nw {net_file} -b {is_bare}'.format( python_path=self.remote_dir, script=path_join(self.remote_dir, 'deploy/prepare/execute.py'), - net_file=path_join(self.remote_dir, self.net_file_name)) + net_file=path_join(self.remote_dir, self.net_file_name), + is_bare=1 if self.adapter == 'ipmi' else 0) self.ssh_run(cmd) def prepare_cluster(self, deploy_file, net_file): @@ -231,7 +232,7 @@ class DaisyServer(object): def prepare_host_and_pxe(self): LI('Prepare host and PXE') - cmd = "python {script} --dha {deploy_file} --network {net_file} --host \'yes\' --isbare {is_bare} --scenario {scenarion}".format( + cmd = "python {script} --dha {deploy_file} --network {net_file} --host \'yes\' --isbare {is_bare} --scenario {scenario}".format( script=path_join(self.remote_dir, 'deploy/tempest.py'), deploy_file=path_join(self.remote_dir, self.deploy_file_name), net_file=path_join(self.remote_dir, self.net_file_name), diff --git a/docs/developer/design/index.rst b/docs/developer/design/index.rst new file mode 100644 index 00000000..bc5e9f40 --- /dev/null +++ b/docs/developer/design/index.rst @@ -0,0 +1,16 @@ +.. This document is protected/licensed under the following conditions +.. (c) Sun Jing (ZTE corporation) +.. Licensed under a Creative Commons Attribution 4.0 International License. +.. You should have received a copy of the license along with this work. +.. If not, see <http://creativecommons.org/licenses/by/4.0/>. + +************************* +Design Docs for Daisy4nfv +************************* + +.. toctree:: + :numbered: + :maxdepth: 2 + + multicast.rst + diff --git a/docs/installationprocedure/index.rst b/docs/installationprocedure/index.rst index f88c8a5f..8c5a3da7 100644 --- a/docs/installationprocedure/index.rst +++ b/docs/installationprocedure/index.rst @@ -1,9 +1,11 @@ +.. _daisy-installation: + .. This work is licensed under a Creative Commons Attribution 4.0 International License. .. http://creativecommons.org/licenses/by/4.0 -******************************************************** -OPNFV(Danube) Daisy4nfv Installation Guide -******************************************************** +********************************** +OPNFV Daisy4nfv Installation Guide +********************************** .. toctree:: :numbered: diff --git a/docs/releasenotes/index.rst b/docs/releasenotes/index.rst index 224ec466..0da52b5f 100644 --- a/docs/releasenotes/index.rst +++ b/docs/releasenotes/index.rst @@ -1,12 +1,14 @@ +.. _daisy-releasenotes: + .. This document is protected/licensed under the following conditions .. (c) Sun Jing (ZTE corporation) .. Licensed under a Creative Commons Attribution 4.0 International License. .. You should have received a copy of the license along with this work. .. If not, see <http://creativecommons.org/licenses/by/4.0/>. -***************************** +*************************** Release notes for Daisy4nfv -***************************** +*************************** .. toctree:: :numbered: diff --git a/docs/releasenotes/release-notes.rst b/docs/releasenotes/release-notes.rst index 795f6028..629d05de 100644 --- a/docs/releasenotes/release-notes.rst +++ b/docs/releasenotes/release-notes.rst @@ -10,6 +10,131 @@ Abstract ======== -This document compiles the release notes for the D 2.0 release of -OPNFV when using Daisy4nfv as a deployment tool. +This document covers features, limitations and required system resources of +OPNFV E 1.0 release when using Daisy4nfv as a deployment tool. + +Introduction +============ + +Daisy4nfv is an OPNFV installer project based on open source project Daisycloud-core, +which provides containerized deployment and management of OpenStack and other distributed systems such as OpenDaylight. + +Release Data +============ + ++--------------------------------------+--------------------------------------+ +| **Project** | Daisy4nfv | +| | | ++--------------------------------------+--------------------------------------+ +| **Repo/tag** | Daisy4nfv/Euphrates.1.0 | +| | | ++--------------------------------------+--------------------------------------+ +| **Release designation** | Euphrates.1.0 | +| | | ++--------------------------------------+--------------------------------------+ +| **Release date** | | +| | | ++--------------------------------------+--------------------------------------+ +| **Purpose of the delivery** | OPNFV Euphrates release | +| | | ++--------------------------------------+--------------------------------------+ + +Deliverables +------------ + +Software deliverables +~~~~~~~~~~~~~~~~~~~~~ + + - Daisy4nfv/Euphrates.1.0 ISO, please get it from `OPNFV software download page <https://www.opnfv.org/software/>`_ + +.. _document-label: + +Documentation deliverables +~~~~~~~~~~~~~~~~~~~~~~~~~~ + + - OPNFV(Danube) Daisy4nfv installation instructions + + - OPNFV(Danube) Daisy4nfv Release Notes + +Version change +-------------- +.. This section describes the changes made since the last version of this document. + +Module version change +~~~~~~~~~~~~~~~~~~~~~ + +This is the Euphrates release of Daisy4nfv as a deployment toolchain in OPNFV, the following +upstream components supported with this release. + + - Centos 7.3 + + - Openstack (Ocata release) + + - Opendaylight (Carbon release) + +Reason for new version +---------------------- + +Feature additions +~~~~~~~~~~~~~~~~~ + ++--------------------------------------+-----------------------------------------+ +| **JIRA REFERENCE** | **SLOGAN** | +| | | ++--------------------------------------+-----------------------------------------+ +| | Support OpenDayLight Carbon | +| | | ++--------------------------------------+-----------------------------------------+ +| | Support OpenStack Ocata | +| | | ++--------------------------------------+-----------------------------------------+ + + + +Bug corrections +~~~~~~~~~~~~~~~ + +**JIRA TICKETS:** + ++--------------------------------------+--------------------------------------+ +| **JIRA REFERENCE** | **SLOGAN** | +| | | ++--------------------------------------+--------------------------------------+ +| | | +| | | ++--------------------------------------+--------------------------------------+ + + +Known Limitations, Issues and Workarounds +========================================= + +System Limitations +------------------ + +**Max number of blades:** 1 Jumphost, 3 Controllers, 20 Compute blades + +**Min number of blades:** 1 Jumphost, 1 Controller, 1 Compute blade + +**Storage:** Ceph is the only supported storage configuration + +**Min Jumphost requirements:** At least 16GB of RAM, 16 core CPU + +Known issues +------------ + ++----------------------+-------------------------------+-----------------------+ +| **Scenario** | **Issue** | **Workarounds** | ++----------------------+-------------------------------+-----------------------+ +| | | | +| | | | +| | | | ++----------------------+-------------------------------+-----------------------+ +| All HA scenario | Occasionally lose VIP | Failed in testcase, | +| | | normal in usage | ++----------------------+-------------------------------+-----------------------+ + + +Test Result +=========== +TODO |