summaryrefslogtreecommitdiffstats
path: root/deploy
AgeCommit message (Collapse)AuthorFilesLines
2018-01-19Merge "Add extra parameter to integrate with doctor"Zhijiang Hu2-2/+19
2018-01-19Merge "support dpdk"Zhijiang Hu1-5/+18
2018-01-16support dpdk001845321-5/+18
Change-Id: I30970093bab418d679d3a3396d16aaff257272f4 Signed-off-by: 00184532 <lu.yao135@zte.com.cn>
2018-01-16Add extra parameter to integrate with doctorzhouya2-2/+19
Need to change some parameter of ceilometer to run doctor. In order not to influence other scenario, add an extra '-d' argument for doctor test only to change event_pipelint.yaml template file in kolla-ansible code. Change-Id: Ia5536658b2a2698bc1384e255328d4d719cc566c Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2018-01-15modify check openstack installation progresszhouya1-3/+3
Due to the add of 'role' column in host-list check openstack progress shell script has to change the num in filter line Merge after this commit been merged. https://review.openstack.org/#/c/531105/ Change-Id: If089eafeb8b30883f9310ebdc2fe912352031e7f Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2018-01-12Align example config files to pharos formatZhijiang Hu3-56/+56
After [1], get_mac_addresses_for_virtual()'s behavior was changed. So in order to let it to produce right mac_addresses for both pharos's and example's config file, the example config files' format should also be changed accordingly. [1] https://gerrit.opnfv.org/gerrit/#/c/50325/ Change-Id: Ia1ee481057fbe87ab8410c0354c4724bcf013ac4 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2018-01-09Provide default password for daisy serverAlex Yang1-2/+4
There is no PDF for virtual pods now. And daisy_passwd was deleted from the deploy.yml of zte-virtual1 in pharos. Change-Id: I0a6fba8fa634806a21779a382f5ff07f9450e270 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2018-01-04Fix security risks about shell=TrueAlex Yang1-3/+2
Change-Id: I2db012e2b6a4325c42d5422901dea52a5ab7f664 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-12-25Now SDL cluster use kolla_internal_vip_address as VIPZhijiang Hu1-2/+2
Change-Id: Id22c86d4d2c7c18bba36dc9b50cd56bf75d94053 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-11-18password auth module seems can not accept region_name as argumentZhijiang Hu1-2/+1
Please see the error info at the end of [1]. [1] https://build.opnfv.org/ci/job/daisy-deploy-daily-master/815/console Change-Id: I309fd858ea10a8821c95d66a27b7840a7f70151c Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-11-13Bugfix for 47103Zhijiang Hu1-2/+2
Change-Id: I013e19ddcceac32e964b6a930edd653a552ca83d Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-11-12Dump log after deplying timeoutZhijiang Hu1-18/+36
Change-Id: I8ff298bc09bd3117f5ae8a1d81be3e5661a56e9a Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-11-08modify iterface to interface001845321-1/+1
Change-Id: I659906163ec7bb5156786269349cc819ea051754 Signed-off-by: 00184532 <lu.yao135@zte.com.cn>
2017-10-30Missing parameters in tempestAlex Yang1-12/+12
In patch 45763, client parameters were missed in some functions. Change-Id: Id311e9ee6c0f7b24fe81832e2de9787e4f5693d7 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-10-26Merge "Skip recreate Daisy server VM if it exists in python"Zhijiang Hu3-30/+56
2017-10-26Merge "Add the unit test file test_tempest.py"Zhijiang Hu1-26/+24
2017-10-19Add the unit test file test_tempest.pyzhongjun1-26/+24
1.Add the unit test file test_tempest.py and related test data file daisyrc_admin, test stub file daisyclient_stub.py for tempest.py 2.modify the tempest.py to adapt the unit test. Change-Id: Ice92ed5a01a049a1a828f7f9e13979bda4b026b7 Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-10-19Merge "remove unused null value of assigned network"Zhijiang Hu1-13/+13
2017-10-18Skip recreate Daisy server VM if it exists in pythonAlex Yang3-30/+56
Do not recreate daisy server if it exists. Reference to the bash code in patch [1]. [1] https://gerrit.opnfv.org/gerrit/#/c/40337/ Change-Id: If472c59ea180e550f358af4a3a9c7b42e575eddc Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-10-13remove unused null value of assigned networkzhouya1-13/+13
change 'map' reserved keyword of python to regular variable Change-Id: I077eca363c095d0596fcd06bbad2e442050cb264 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-10-12Support securelab dir param in python scriptAlex Yang1-18/+13
Change-Id: I39d6643aac190820ae30b945f71d21a0ea2e73c9 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-09-29Exit deploy when exception occurredAlex Yang1-0/+1
Exception occurred in [1]. But te deployment didn't stop and blocked for a long time. [1] https://build.opnfv.org/ci/job/daisy-deploy-baremetal-daily-master/169/ Change-Id: I0d5639da1e0d011855df0b0651328f11168e5d01 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-09-26Fix delete_virtual_network function callzhongjun1-1/+1
create_daisy_server_network method in VirtualEnvironment class calls self.delete_virtual_network, but it doesn't exist, actually it should be delete_virtual_network function in module libvirt_utils.py. Change-Id: I381e916097744827a22d311b275611df38d8e1be Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-09-26Merge "Add some unittest files such as test_nova.py"Zhijiang Hu1-8/+8
2017-09-21Add some unittest files such as test_nova.pyzhongjun1-8/+8
1.Add test_glance.py, test_neutron.py and test_nova.py unittest files, and modify the neutron.py to adapt the unittest. 2.Add some unittest functions in test_post_execute.py, test_deploy.py, test_keystoneauth.py. 3.rename test_prepare_execure.py to test_prepare_execute.py. Change-Id: Ie0640d133e27c558648416a6a5cf044a00ffa67f Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-09-21Use pxe bridge to replace the bridge in VM templateAlex Yang3-13/+32
1. Eliminate hard code about pxe bridge 2. Replace the bridge in daisy VM template with the pxe bridge provided by jenkins Change-Id: I7a8463181847417d10705ce9ff4db6e68d505c6d Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-09-12Eliminate hard code about ipmi info in bash scriptAlex Yang1-23/+38
Change-Id: I642d130566137dff727b7227658afe6ace9473d6 Signed-off-by: Alex Yang <yangyang1@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-06Eliminate hard coding about ipmi infoAlex Yang2-18/+17
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-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-08-29Refactor the parameters checkingAlex Yang1-41/+37
Change-Id: I0acd39671ea8b7e574719acb96b8c5df93b66443 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-26revert build_pxe_for_discover function to build pxe serverzhouya2-1/+21
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-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-18Merge "Add pytest file for prepare/execute.py"Zhijiang Hu1-1/+1
2017-08-18Add pytest file for prepare/execute.pyzhongjun1-1/+1
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 serverzhouya2-11/+3
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-09Merge "Use PDF(POD descriptor file) and correct the mapping of nodes and roles"Zhijiang Hu1-5/+43
2017-08-08Fix bug in baremetal deploy with python scriptAlex Yang1-1/+2
Change-Id: I782c4d732ee8774526b21abd3e8636e65916ce3b Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-05Revert "Optimize list express to list generator"Zhijiang Hu1-2/+3
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-04Merge "Support os-odl-nofeature-* as new scenarios"Alex Yang5-6/+116
2017-08-04Support os-odl-nofeature-* as new scenariosZhijiang Hu5-6/+116
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-04Optimize list express to list generatorzhongjun1-3/+2
optimize list express to list generator in tempest.py Change-Id: I8ba12d33a1fc8b33e29fa0a08d7be40a1361bb65 Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-08-03Use PDF(POD descriptor file) and correct the mapping of nodes and rolesAlex Yang1-5/+43
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-01Remove useless parameters and rename some parameters in get_conf.pyAlex Yang1-14/+14
Change-Id: I47949f44ea609932059374b128018e36590e88fd Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-07-31Correct the mapping of nodes and roles in virtual deployAlex Yang5-15/+42
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-31use only one file get_conf.py to get configuration data from deploy.ymlzhouya2-57/+46
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>