summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-09-25Merge "Support passing securelab dir as a optional param" into stable/euphratesZhijiang Hu1-4/+10
2017-09-25Support passing securelab dir as a optional paramZhijiang Hu1-4/+10
Change-Id: I5caadb42b3890858e7642a5fd260392370dbbfc8 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn> (cherry picked from commit 02e1f1c8ab3f3857ca2370f98575ccbf41f12a01)
2017-09-18Use virsh reset instead of rebootAlex Yang1-2/+2
Sometimes the VMs do not reboot when using "virsh reboot". The virtual depoyment CI jobs failed recently. Change-Id: Id8b3ef638a7ba8f584c6e4c03d11e77d2919a35b Signed-off-by: Alex Yang <yangyang1@zte.com.cn> (cherry picked from commit 799e1323c05853e83ba01a54ac42818b4309c591)
2017-09-12Eliminate hard code about ipmi info in bash scriptAlex Yang2-27/+64
Change-Id: I642d130566137dff727b7227658afe6ace9473d6 Signed-off-by: Alex Yang <yangyang1@zte.com.cn> (cherry picked from commit 94d3957c5aba2db70d06929ac9538280a71c6641)
2017-09-11Add developer doc for deployment detailZhijiang Hu2-0/+59
Change-Id: I03c283222060677f7ce7b5ddb0241db78e52b481 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-09-10get_mac_addresses_for_virtual() suppors all-in-one envZhijiang Hu1-6/+16
Change-Id: I6514292b16c784ced0dcb82d639fe10b425d63e2 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-09-09Export kolla preparation log when install failedAlex Yang1-6/+18
Change-Id: I08844b899de2dba539b3c3942345f83d1ac3c198 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-09-08Merge "Kill zip() in add_hosts_interface()"Zhijiang Hu1-12/+20
2017-09-06Kill zip() in add_hosts_interface()Zhijiang Hu1-12/+20
Since mac_address_map is always avaliable, there is no need to pass host_name into add_hosts_interface() and use zip() to do strange combination any more. This change: 1) Is trying to make code more understandable 2) Also delete a unused parameter for add_host_role() Change-Id: Icef47cdf7f1a1522600b351f6e2f47d6f62efa9f Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-09-06Merge "Eliminate hard coding about ipmi info"Zhijiang Hu4-19/+59
2017-09-06Eliminate hard coding about ipmi infoAlex Yang4-19/+59
1. Eliminate hard coding 2. Add ipmi info in schemas 3. Add unit test Change-Id: I4561bbc9454e02fd1de2106645db341a4129245b Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-09-05Add doc for building kolla imageZhijiang Hu3-1/+43
Change-Id: I7d25c13221e60d40801dc694efe8c32c31ebfabf Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-09-05Merge "Uniform the variable definition makefile_path.sh"Zhijiang Hu1-6/+9
2017-09-02Enlarge kolla log output size to 5000 linesZhijiang Hu1-1/+1
Change-Id: I9916d494e67b788d491b44fc1d0202d5ac20e710 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-09-01Merge "Add some unit test files test_netwrok.py"Zhijiang Hu5-0/+285
2017-09-01Uniform the variable definition makefile_path.shzhongjun1-6/+9
replace all the "${TOOLS_PATH}/setup/bin_temp" statement to the variable $target_dir Change-Id: I62b95f1780a7cd5e0c8c4e60a5b0661a2a9937bd Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-08-31Add some unit test files test_netwrok.pyzhongjun5-0/+285
1.add the below unit test files: test_netwrok.py/test_schemas.py/test_query.py/test_utils.py 2.add the corresponding test conf file deploy_virtual_error.yml. Change-Id: I01292d4c94b9d6159597961a0cab515f57727ec3 Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-08-31Merge "Add some test case in test_post_execute.py"Zhijiang Hu7-21/+163
2017-08-31Merge "change update doc"Zhijiang Hu1-2/+4
2017-08-31Merge "Support build with extent tag"Zhijiang Hu1-21/+61
2017-08-31change update docZhijiang Hu1-2/+4
Change-Id: I3593593d540bf0e74ae1642f3450d4945af8a334 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-30Support build with extent tagZhijiang Hu1-21/+61
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-30Merge "Refactor the parameters checking"Zhijiang Hu1-41/+37
2017-08-30Add some test case in test_post_execute.pyzhongjun7-21/+163
1.add some test case in test_post_execute.py. 2.rename test_execute.py to test_prepare_execute.py and add clearup handle in test function. Change-Id: I1ed27ce6f0a5ba8bbd56544ae8d53e14f7daa9ea Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-08-29Refactor the parameters checkingAlex Yang1-41/+37
Change-Id: I0acd39671ea8b7e574719acb96b8c5df93b66443 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-28Add OpenStack reconfig and Upgrade docsZhijiang Hu5-3/+149
Change-Id: I971cc23d47b90cbf03b194d3e6918262b5e3f8a5 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-28Introduce deployment error recovery levelZhijiang Hu3-6/+93
Change-Id: I023a637e793bae845feabed0d7b80072d3f9f0b7 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-26revert build_pxe_for_discover function to build pxe serverzhouya3-4/+22
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-26Merge "deploy.sh refactory"Zhijiang Hu1-43/+101
2017-08-26Merge "Add the pytest files for post py files"Zhijiang Hu4-0/+126
2017-08-26deploy.sh refactoryZhijiang Hu1-43/+101
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-25Add the pytest files for post py fileszhongjun4-0/+126
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-23Update all-in-one VM CPUs from 4 to 8Zhijiang Hu1-1/+1
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-21Merge "Add tools for testing FIP"Zhijiang Hu1-0/+63
2017-08-21Add tools for testing FIPZhijiang Hu1-0/+63
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-21Merge "delete the HEARTBEAT plane in all_in_one network"Zhijiang Hu1-8/+0
2017-08-21Merge "Add doc for describing CI jobs"Zhijiang Hu3-2/+46
2017-08-21delete the HEARTBEAT plane in all_in_one networkzhouya1-8/+0
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-21detail deploy guide rstzhouya2-15/+61
Change-Id: I0a3dddb1356a8f50f9d0a35d69c39b7a483b7a20 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-08-21Add doc for describing CI jobsZhijiang Hu3-2/+46
Change-Id: Ief4cdd41324bd1957b581937ad19f4779575c35a Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-18Merge "Sync the kolla version with the upstream"Zhijiang Hu2-2/+2
2017-08-18Merge "Add pytest file for prepare/execute.py"Zhijiang Hu2-1/+56
2017-08-18Sync the kolla version with the upstreamAlex Yang2-2/+2
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-18Add pytest file for prepare/execute.pyzhongjun2-1/+56
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-18Merge "Modify schemas.py"Zhijiang Hu1-3/+33
2017-08-17Modify schemas.pyAlex Yang1-3/+33
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-17use daisy.conf to build pxe serverzhouya4-13/+41
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-16Fix an error in sed statementAlex Yang1-1/+2
JIRA: DAISY-42 Change-Id: I0fd709bb0dbee42cdc73076773cb635be6ba02cd Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-10Add more unit test case in test_get_conf.pyzhongjun3-41/+158
Add more unit test cases by pytest parametrize fixture. Change-Id: I208bcff9af79b73556638e20df96235c4ac60ee2 Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-08-09Merge "Use PDF(POD descriptor file) and correct the mapping of nodes and roles"Zhijiang Hu4-5/+79