summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-05-25Merge "Use unified vm template files in python deploy script"Zhijiang Hu6-3/+280
2017-05-25Remove the incomplete file and re-download itAlex Yang1-12/+52
The kolla file downloaded on the ci node may be incomplete. Change-Id: Id15695504bd29f31178054b5e8cc83d8612543d9 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-05-25Use unified vm template files in python deploy scriptAlex Yang6-3/+280
Change-Id: I386011a35a9be3e4f1d468744a6945360bb2adb3 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-05-25Merge "Code optimization for list traversal"Zhijiang Hu1-8/+4
2017-05-25Merge "enlarge the ram of all_in_one node"Zhijiang Hu1-2/+2
2017-05-25Add dependencies for ocata version into docker fileAlex Yang1-0/+1
Change-Id: I3dc81449293a00b5b095ecea8a48a0cdb03cd4e8 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-05-24enlarge the ram of all_in_one nodeAlex Yang1-2/+2
No the memory is not enough to creates vms in openstack to finish functest cases. Change-Id: I836ba43e8cd8a26a0dec3f5831cabcb9ae04e5da Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-05-23support ocata openstack, keep up with the upstreamAlex Yang4-25/+58
The upstream openstack/daisycloud-core supports ocata openstack now. https://review.openstack.org/#/c/465410/ Change-Id: I14825c80cdd2297e5b0df3680f30fa5c32de3cc4 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-05-19Code optimization for list traversalzhongjun1-8/+4
1.replace the list to generator to simply the code. Change-Id: Ia67cf265f3ca004eab5abb8b1d742f53b7d554ad Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-05-15add separated disk for ceph in multi-nodes virtual deployAlex Yang4-15/+41
Change-Id: Ic3f67bb889c20e95916a1052f0cfa1e238f133a8 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-05-15Merge "refacort deploy.yml and add jsonschema to validate it"Zhijiang Hu8-23/+106
2017-05-13Kill git-version-genZhijiang Hu4-173/+1
This PS set the jasmine version in configure.ac so there is no need to calculate version from git. So we can get rid of git-version-gen as well as its GPL licence. Change-Id: I7434dcd5259ba800f17e28281ef6c6f484aa7ef3 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-05-10refacort deploy.yml and add jsonschema to validate itAlex Yang8-23/+106
1. add adapter type in deploy.yml Do not rely on the pod's name to detemine whether impi or libvirt should be used. 2. increase disk size in deploy.yml The disk sizes should be bigger than 102400 mega-bytes according to the minimum of root_lv_size in upstream openstack/daisycloud-core. 3. add schemas.py Use jsonschema to validate deploy.yml Change-Id: I3f197f93403caece75460147c8df49b95e0ae9d3 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-05-08Compatible with the no mapping in network.ymlzhongjun1-2/+3
1)resolve the error ' AttributeError: 'NetworkConfig' object has no attribute 'ext_mapping'' with the no mapping in network.yml. 2)resolve the creating external subnet failure if the external netwok exists. Change-Id: I578365d91b8b61f9f88a5d4ff2c9db9ecc512edc Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-05-05Merge "Hardcoded physnet1 changed to obtain from .yml"Zhijiang Hu4-4/+6
2017-05-05Merge "Increase PACKETS_PER_BUFFER to 65536"Zhijiang Hu4-9/+17
2017-05-05Merge "Implement the deployment script with python"Zhijiang Hu7-0/+1095
2017-05-04Increase PACKETS_PER_BUFFER to 65536Zhijiang Hu4-9/+17
1) This mainly increase PACKETS_PER_BUFFER to 65536 to reduce the frequency of TCP client acks. 2) Also kills TCP_BUFF_SIZE and define each buffer size in a more intuitive way. 3) Free more unused memory to prevent being killed by oom-killer after enlarged PACKETS_PER_BUFFER. 4) Increase client's select() timeout to 20 secs, since we encountered timeout due to CPU busy in the same BM but with 20 VMs. Tested this PS in a 10 VM node env, and it can multicast a 2.7G file to 10 VMs in 6 minutes, while unicast needs 30+ minutes. Change-Id: Iaf862fb1f1259cc770f720ccdd95dcc281aef262 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-05-03Hardcoded physnet1 changed to obtain from .ymlzhongjun4-4/+6
the physical network device of external network is hardcode to 'physnet1',change it to obtain from network.yml configuration file. Change-Id: Id2e45ac488619db2247e73cc3fed5706db31d9e9 Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-04-28Implement the deployment script with pythonAlex Yang7-0/+1095
1. deploy.py: control the work flow of the deployment 2. daisy_server.py: maintain the ssh connection with daisy server and execute ssh commands 3. environment.py: create/find/delete the nodes/vms, install operating system and openstack on nodes 4. libvirt_utils.py: deal with the vm templates and call virsh commands 5. utils.py: some common functions such as file/directory/bash operation Change-Id: I1caa4b0b3118665e15410e8f02bcb6473e5a530b Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-04-26Merge "Print out error message of docker commands"Zhijiang Hu1-2/+2
2017-04-25Print out error message of docker commandsZhijiang Hu1-2/+2
This print out error message of docker commands to find out the reason of error like[1] [1] https://build.opnfv.org/ci/job/daisy-build-daily-master/239/consoleFull Change-Id: Ic1bd85d999dbe584764bc9a05d22579835e55516 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-04-25modify daisy.conf sleep long for trustme modify cpumodezhouya11-26/+18
1.add multicast flag in daisy.conf 2.sleep40 for trustme.sh execute ok 3.modify cpu mode of xml file to make it much more general 4.fix check_openstack_progress parameter error Change-Id: Ic150698ede448b7651e95d129aeb7d97a8f34309 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-04-25Merge "ignore the git history in daisy building job"Zhijiang Hu1-5/+4
2017-04-25ignore the git history in daisy building jobAlex Yang1-5/+4
Now the daisycloud-core is a big repo because there are some big files in the git history. Use "--depth 1" to reduce the amount to download. Change-Id: I8ce0dc6675d2239a126bcf558300f1ad45cd3fb3 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-04-24Unify the kolla config in pyzhongjun2-2/+8
put the kolla nova-compute.conf file update handle to prepare/ execute.py for unify the all relate kolla config in py way. Change-Id: Iac585df97d2855038a83f9bfdadfb9e449660c9c Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-04-19Solve "Buffer I/O error on dev loop0p1" error messageZhijiang Hu1-2/+2
This add "losetup" before "kpartx -l" command, otherwise, we encountered many "Buffer I/O error on dev loop0p1, logical block 104854018, async page read" in dmesg. But they are seems no harm. No need to do "losetup -d" after "losetup", because "kpartx -dv" will do that for us. Change-Id: I326ef35a241d8b09f0f3f3fc90ef749df3f4768f Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-04-17Merge "The image file is deleted mistakenly"Zhijiang Hu1-3/+3
2017-04-17Merge "Modify the log message in deploy script"Zhijiang Hu1-20/+14
2017-04-17Merge "Treat bad command line usage as error"Zhijiang Hu1-1/+1
2017-04-16The image file is deleted mistakenlyAlex Yang1-3/+3
There's an mistake in patch 33327. See https://gerrit.opnfv.org/gerrit/#/c/33327/ The cleanup function was called twice, so the image file was deleted. Change-Id: I5fe6a90b46739d1c6d8b66365d2c8e55350cde00 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-04-15Modify the log message in deploy scriptAlex Yang1-20/+14
1. Move an log message to the correct location(now at line 331). In baremetal deployment, the virtual-deploy message is printed. 2. Modify all the "===" in the log messages to the same number of "=" 3. Remove the TODO list since the work finished Change-Id: I34325c522036caf9d1aa58c9cbf30eb77843fdfc Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-04-15Treat bad command line usage as errorZhijiang Hu1-1/+1
Since we can not tolerate any kind of error which may result in multicasting failed to run. So even the usage error shall be treated as error too. Change-Id: I5483bb2cebf437ed33ebb79eeeac640f8728a73f Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-04-15Merge "add the argument WORKDIR in daisy-img-modify.sh"Zhijiang Hu2-8/+12
2017-04-14add the argument WORKDIR in daisy-img-modify.shzhongjun2-8/+12
the daisy install tmp workdir can be configurated as an input argument in deploy.sh,and it also should be used in subshell daisy-img-modify.sh,so add the input argument -w workdir in daisy-img-modify.sh. 1.add an input argument -w workdir in daisy-img-modify.sh. 2.modify the WORKDIR default value to /tmp/workdir/daisy. 3.code refactor to put the centos7.qcow2 file clean statement from the deploy.sh to daisy-img-modify.sh. Change-Id: Id375a15ad2839c209329e644c5e032d044604e7d Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-04-14Merge "support mutinode deploy in vm deployment env"Zhijiang Hu10-33/+795
2017-04-14Merge "Nominating Alex Yang <yangyang1@zte.com.cn> as committer for ↵Zhijiang Hu1-2/+10
Daisy4NFV project."
2017-04-13Nominating Alex Yang <yangyang1@zte.com.cn> as committer for Daisy4NFV project.Zhijiang Hu1-2/+10
Alex has been contributing the majority of code to Daisy4NFV since the last season[1][2]. I have had a talk with him on IRC meeting [3] and he expressed willing to contribute more to Daisy4NFV project and I believe he will make a great addition to the core review team. All Daisy4NFV committers, please vote +1 or +2 if you support this nomination [4]. This PS also propose a committer removal. Jian Yang (yangjianyjy@chinamobile.com) has been inactive in the project for a long time. He - was not present in the project meetings for more than 6 months (see participant lists in the minutes or IRC); AND - did not contribute any patch for the project for more than 6 months; AND - did not participate in the email discussion of the project for more than 6 month AND - We failed to contact him offline. [1] http://stackalytics.com/?project_type=opnfv-group&metric=commits&release=all&module=daisy [2] https://gerrit.opnfv.org/gerrit/#/q/owner:yangyang1%2540zte.com.cn+status:merged+project:daisy [3] http://eavesdrop.openstack.org/meetings/daisycloud/2017/daisycloud.2017-03-24-07.58.log.html [4] https://wiki.opnfv.org/display/DEV/Committer+Promotions Change-Id: Ibd416d93d01c7fe769dfc0c5809baca4cdefca46 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-04-11support mutinode deploy in vm deployment envzhouya10-33/+795
Change-Id: Ic9e19d4e120fc53d96d0794239cd6e421f25ea27 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-04-10Add rpm based installation docZhijiang Hu1-0/+7
Change-Id: I50d5750e985b258cef7874c88902b8fae0539e25 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-04-10Merge "Add required packages for build jasmine"Zhijiang Hu2-0/+5
2017-04-10Add required packages for build jasmineZhijiang Hu2-0/+5
Also add code/jasmine/.tarball-version to set version manually, otherwise we need more software such as git to get the version and also we may encounter rpmbuild error due to rpmbuild does not support dash character in git version. Change-Id: If9b7ef75cbc0a5e4987658454b47abf02b451989 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-04-10modify service name in service disk tablezhouya1-4/+7
Change-Id: Ic33381ef3339bdcec82cba7afbfc2d32f6e88be4 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-04-10Merge "code variable name refactor"Zhijiang Hu1-19/+21
2017-04-10code variable name refactorzhongjun1-19/+21
refactor the deploy.sh variable name 1.unify the glabs var name to upper case. 2.refactor the variable of target_node_net/daisy_server_net to add prefix VMDEPLOY for code readablity. 3.refactor the usage() to function usage for uniform the code style. Change-Id: Ibd7ea91ac8b19cd7147e3a7d97b3359880cec59c Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-04-07jasmine(Just A Simple Multicast engINE) Initial mergev1.0.2Zhijiang Hu21-0/+2275
Change-Id: I7a543019c8d92314ef549bf72369b7276f39577d Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-04-07Merge "Add multicast spec"Zhijiang Hu2-0/+468
2017-04-06Add multicast specZhijiang Hu2-0/+468
Change-Id: I3f9b9167864126b7b455761799dc79c40c394854 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-04-06Merge "delete redundant parameters in cluster_meta"Zhijiang Hu1-3/+1
2017-04-06delete redundant parameters in cluster_metazhouya1-3/+1
when we deploy the baremetal,do not have to use pxe_only and skip_pxe_ipmi parameters,or we can't call 'daisy install' command Change-Id: Ief5131c47c16412b8dacec50b5a7858b65baa7a2 Signed-off-by: zhouya <zhou.ya@zte.com.cn>