summaryrefslogtreecommitdiffstats
path: root/docs/submodules/daisy
AgeCommit message (Collapse)AuthorFilesLines
2017-08-31Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "change update doc" - change update doc Change-Id: I3593593d540bf0e74ae1642f3450d4945af8a334 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-31Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Support build with extent tag" - Support build with extent tag Kolla offcial image tag is, for example, 4.0.2. Daisy images can be names as 4.0.2.n And Kolla supports upgrading not only from 4.0.2 to 4.0.3, but also from 4.0.2 to 4.0.2.n. It is a convenient way for Daisy to publish its own small changes into images for upgrading. Change-Id: I9d283e1ffa452ac3e04046ab6c96d018d42e0bf9 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-30Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Refactor the parameters checking" - Refactor the parameters checking Change-Id: I0acd39671ea8b7e574719acb96b8c5df93b66443 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-28Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Add OpenStack reconfig and Upgrade docs Change-Id: I971cc23d47b90cbf03b194d3e6918262b5e3f8a5 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-28Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Introduce deployment error recovery level Change-Id: I023a637e793bae845feabed0d7b80072d3f9f0b7 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-26Update git submoduleszhouya1-0/+0
* Update docs/submodules/daisy from branch 'master' - revert build_pxe_for_discover function to build pxe server In case of deploy failed with deploy.sh file without reinstall daisy node, we need to resetup DHCP in tempest.py script Change-Id: Ia7b4de7933bf4957226a2bf0965858a555f0ed54 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-08-26Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "deploy.sh refactory" - deploy.sh refactory This can be seen as a code clean up before we implementing running deploy.sh without recreate daisy vm and networks. Change-Id: I9bb67fdc7220cc70e2e876cc05750c22630d5ac8 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-26Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Add the pytest files for post py files" - Add the pytest files for post py files 1.add the test_keystoneauth.py and test_post_execute.py 2.modify the test-requirements.txt to update the dependent python package. Change-Id: I0957c723bd82faa9060c7d5ae021d46feaed05ae Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-08-24Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Update all-in-one VM CPUs from 4 to 8 By testing we found that all-in-one VM needs more CPUs, otherwise , we encountered high probability failure during kolla deployment. Change-Id: I4ee798c9427c61a696bc8ec33ba4bc72fafcebba Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-21Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Add tools for testing FIP" - Add tools for testing FIP After deployment, we can manually use this script to simply test basic FIP connectivity. Change-Id: Iccc3edd71ea4c3d38dbed09411093a96a9679ae7 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-21Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "delete the HEARTBEAT plane in all_in_one network" - delete the HEARTBEAT plane in all_in_one network There is only one node in all-in-one env,so do not need to configure the HEARTBEAT plane, without this ps,we may get the globals.yml file an extra wrong value of keepalived_interface: '{{ network_interface }}' which is unnecessary for all-in-one env, and will result in keepalive not work, VIP lose, and since we still use VIP in all-in-one env, the whole deployment may fail. Change-Id: Ic1efabb533fd63e95254ad19ccf98adb5da6ae78 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-08-21Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Add doc for describing CI jobs" - Add doc for describing CI jobs Change-Id: Ief4cdd41324bd1957b581937ad19f4779575c35a Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-21Update git submoduleszhouya1-0/+0
* Update docs/submodules/daisy from branch 'master' - detail deploy guide rst Change-Id: I0a3dddb1356a8f50f9d0a35d69c39b7a483b7a20 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-08-18Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Sync the kolla version with the upstream" - Sync the kolla version with the upstream Please see https://review.openstack.org/#/c/494347/ in openstack/daisycloud-core. Change-Id: I9f8ed06b8d2baef6b27562920722c76f4d01f5b1 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-18Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Add pytest file for prepare/execute.py" - Add pytest file for prepare/execute.py 1.Add pytest file test_execute.py for prepare/execute.py. 2.Change the makedirs mode from 0600 to 0700 for test env. Change-Id: Ie29e9e4b4210b170f448faf4df907e55bff1435f Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-08-18Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Modify schemas.py" - Modify schemas.py 1. add schemas for elements added recently in deploy.yml 2. remove daisy_ip from required list, prepare for generate it auto 3. add main() function to make this file useful in bash Change-Id: Ic7a3a87305f96b064260967862f976e33cdea294 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-17Update git submoduleszhouya1-0/+0
* Update docs/submodules/daisy from branch 'master' - use daisy.conf to build pxe server we use the interface of daisyclient to build the pxe server in tempest.py,but we can use the daisy.conf to build the pxe server instead,this is just the optimization of code Change-Id: I7a75d33aa8f80326750d304fa0a881201e956c57 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-08-17Update git submodulesAlex Yang1-0/+0
* Update docs/submodules/daisy from branch 'master' - Fix an error in sed statement JIRA: DAISY-42 Change-Id: I0fd709bb0dbee42cdc73076773cb635be6ba02cd Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-11Update git submoduleszhongjun1-0/+0
* Update docs/submodules/daisy from branch 'master' - Add more unit test case in test_get_conf.py Add more unit test cases by pytest parametrize fixture. Change-Id: I208bcff9af79b73556638e20df96235c4ac60ee2 Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-08-09Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Use PDF(POD descriptor file) and correct the mapping of nodes and roles" - Use PDF(POD descriptor file) and correct the mapping of nodes and roles JIRA: DAISY-42 JIRA: DAISY-56 In bare metal deployment, we can use PDF to get MAC addresses of nodes https://gerrit.opnfv.org/gerrit/#/c/38387/. Then we can use the MACs to help to distinguish the discovered nodes and assign roles to them, like virtual deployment in the link https://gerrit.opnfv.org/gerrit/#/c/38381/. Change-Id: Ib0f1a60b8935f528a828f716ccc916b767cfa6f9 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-09Update git submodulesAlex Yang1-0/+0
* Update docs/submodules/daisy from branch 'master' - Fix bug in baremetal deploy with python script Change-Id: I782c4d732ee8774526b21abd3e8636e65916ce3b Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-07Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Rename jasmine to daisy4nfv-jasmine" - Rename jasmine to daisy4nfv-jasmine Rename to prevent naming confilct Change-Id: I4f2f9cbb0ccf119901c3f450b3220cd4436de4ec Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-05Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Revert "Optimize list express to list generator" This reverts commit e5a787046aff97a9925a35874d2b6535a9a41c0c. Trying to solve [1] Deploy failed!!!.Traceback (most recent call last): File "/home/daisy/deploy/tempest.py", line 94, in prepare_install host_interface_map, vip, isbare) File "/home/daisy/deploy/tempest.py", line 216, in add_hosts_interface add_host_role(cluster_id, host['id'], host_name, host['name'], vip) File "/home/daisy/deploy/tempest.py", line 225, in add_host_role role.name == "COMPUTER"][0] IndexError: list index out of range [1] https://build.opnfv.org/ci/job/daisy-deploy-daily-master/626/consoleFull Change-Id: I4017b4b38fa350a28d9e9dd5b157caab885a80d0 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-04Update git submodulesAlex Yang1-0/+0
* Update docs/submodules/daisy from branch 'master' - Ignore oder in unit test of test_get_conf.py Since the result contains a list, so ignore_order should be True in the comparison. Change-Id: Iff4c655312015a55a69b91692ab6f9696715a143 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-04Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Fix the assert comparison error in test_get_conf.py" - Fix the assert comparison error in test_get_conf.py Because the list/dict parse can not ensure the element sequence in python, using == method to compare the dict content may cause the fault. we replace it with DeepDiff function. Change-Id: I1db52347e24a0b3968bcf645fd47c4fc5b768dc7 Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-08-04Update git submodulesAlex Yang1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Support os-odl-nofeature-* as new scenarios" - Support os-odl-nofeature-* as new scenarios Rename all scenarios with "odl_l3" in their name in Euphrates to just "odl". Daisy will keep "odl_l3" and "odl_l2" (in code, not for user) for further reference. Change-Id: Ib762dd808d4f9467b0e6827b8bbed6d9df7e0e0e Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-04Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Optimize list express to list generator" - Optimize list express to list generator optimize list express to list generator in tempest.py Change-Id: I8ba12d33a1fc8b33e29fa0a08d7be40a1361bb65 Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-08-04Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Add the unit test by pytest for get_conf.py" - Add the unit test by pytest for get_conf.py Add the unit test cases by pytest way for get_conf.py, other python files will be added unit test cases gradually in the future. Change-Id: I2495645defcf7ee1b6014b27810ac956eec9f7de Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-08-03Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Eliminate error logs in virtual deployment" - Eliminate error logs in virtual deployment There are some error messages in virtual deployment, such as "Domain not found" or "network is already active". The script forgets to destroy the keep-alived network, and should not destroy a non-existent VM or network. Change-Id: I8d9dce9d70f732bd6942b293e407e1845d81fc39 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-02Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "use template to replace duplicate xml file" - use template to replace duplicate xml file Change-Id: I9764612171ef3bf2cdfc652420a2b162fcbfab43 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-08-01Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Remove useless parameters and rename some parameters in get_conf.py" - Remove useless parameters and rename some parameters in get_conf.py Change-Id: I47949f44ea609932059374b128018e36590e88fd Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-01Update git submodulesAlex Yang1-0/+0
* Update docs/submodules/daisy from branch 'master' - Fix typo in patch 38381 JIRA: DAISY-56 controller01 -> $name Change-Id: Icd959ca55079a6ac0bfbd181ff134d7decfb89f5 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-01Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Jira: DAISY-36 Update doc structure This PS update doc structure according to [1]. Note: This PS also add content to doc for describing the mapping methods for map role to discovered nodes. [1] http://docs.opnfv.org/en/stable-danube/how-to-use-docs/documentation-guide.html?highlight=templates#document-structure-and-contribution Change-Id: I7b2ef916753cddd8cd845abae8c7d5865c49e1ac Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-07-31Update git submodulesAlex Yang1-0/+0
* Update docs/submodules/daisy from branch 'master' - Correct the mapping of nodes and roles in virtual deploy JIRA: DAISY-56 Now the roles are assigned to nodes randomly, because the function 'add_hosts_interface' in tempest.py just uses zip to map the host's name to the host. libvirt_utils.py: get mac addresses from VM environment.py: save the mac addresses daisy_server.py: write a new deploy.yml which contains the mac addresses and copy the file to daisy server get_conf.py: get mac addresses from the new deploy.yml tempest.py: assigned roles to nodes when the mac addresses matched controller.xml: increase the RAM to make difference with computer nodes deploy.sh: apply this change to bash script Change-Id: Ia61b60d39d319c5d01e3505727fafc63a0585858 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-07-31Update git submoduleszhouya1-0/+0
* Update docs/submodules/daisy from branch 'master' - use only one file get_conf.py to get configuration data from deploy.yml just move the code from get_para_from_deploy to get_conf file no functionality change. Change-Id: I86aa1325ff37cb2ae0784c9487e62e95cc23f644 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-07-28Update git submodulesAlex Yang1-0/+0
* Update docs/submodules/daisy from branch 'master' - Do not provide ipmi user and password in virtual deployment Change-Id: Ib7989bed237a03cdab01fea89aba4e2038815e5f Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-07-28Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Solve double container removal problem" - Solve double container removal problem From [1], We got an error from docker: "No such container: daisy" while issuing "docker rm -v -f daisy", this OK because we do docker run --rm before this. So it is safe to add "|| true" after "docker rm -v -f daisy". [1] https://build.opnfv.org/ci/job/daisy-build-daily-master/500/console Change-Id: I3d17595156f1b6181a84d9a03e2cd6ddff275eb3 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-07-27Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Convert the bash commands in post.sh to python code" - Convert the bash commands in post.sh to python code According to the comment from Serena in the patch https://gerrit.opnfv.org/gerrit/#/c/37857/, the bash code in post.sh can be implemented by python, and the deploy script can call post/execute.py directly. Change-Id: Ibcf86fc2b6ee3942e4082384c9d4075d608b7294 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-07-26Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Close upstream merge window Switch to upstream daisy's stable/ocata branch Change-Id: I5ff0b0a28a8d2f76f0cb813af8f8241175bb6054 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-07-25Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Sync some patches of bash script to python" - Sync some patches of bash script to python Change-Id: Ia1eb59e62b1bb98b1871ec591e2c925c1734cc2e Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-07-25Update git submodulesroot1-0/+0
* Update docs/submodules/daisy from branch 'master' - when deploy have failed print the api log Change-Id: I6047340f7f0d2c7b6b175335bdbf836a2a8d0a9c Signed-off-by: root <zhou.ya@zte.com.cn>
2017-07-21Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - md5sum check for cirros image Change-Id: I874c40eb5da54c38ce8aa2d1fb1840a8aee22b4c Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-07-13Update git submodulesroot1-0/+0
* Update docs/submodules/daisy from branch 'master' - add sdn_controller_ip to admin_openrc.sh Change-Id: I3af46368109bc5358fd0cc61a43f5be60479eab3 Signed-off-by: root <zhou.ya@zte.com.cn>
2017-07-07Update git submoduleszhongjun1-0/+0
* Update docs/submodules/daisy from branch 'master' - Enable HA scenarios Enable HA scenario options due to support HA function in upsteam. Change-Id: Ie1889afc1a149f171a9b324eb284fd650baed397 Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-07-07Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "add heartbeat interface introduction in docs" - add heartbeat interface introduction in docs Change-Id: Iaf206f9ea5962410c859ad6f84b03ef1a1aa7771 Signed-off-by: root <zhou.ya@zte.com.cn>
2017-07-07Update git submodulesroot1-0/+0
* Update docs/submodules/daisy from branch 'master' - add extra interface to enable the keepablived plane and the api plane Change-Id: I0157bf8b6fa9be254c61bb384065f80107ab3dda Signed-off-by: root <zhou.ya@zte.com.cn>
2017-07-04Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - os-nosdn-nofeature-ha as a valid scenario Project job deployment job uses os-nosdn-nofeature-ha currently, so we need to treat os-nosdn-nofeature-ha as a valid scenario to let the job continue to work. Change-Id: Ib9311ada9b043b1f695f43edb51adbb3714d3356 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-06-30Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Initial merge of BM Installation guide" - Initial merge of BM Installation guide Change-Id: I9964f0d75ae879c6b86d245f2007841236a0b931 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-06-30Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Jira: DAISY-36 Initial merge of release-note" - Jira: DAISY-36 Initial merge of release-note Also fix some index.rst Change-Id: I6aae9fbc5821e8a1c65a02c6b8926e42a10c19cb Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-06-29Update git submodulesAlex Yang1-0/+0
* Update docs/submodules/daisy from branch 'master' - Add an missing parameter and fix a typo in daisy_server.py Change-Id: I339508f1c07a9bbefa389c6f6eb5e53640a79417 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>