summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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>
2017-04-06Get the right columns according to the upstream patchAlex Yang1-3/+5
A column named 'Tecs_version_id' is added in the upstream patch https://review.openstack.org/#/c/450056/. So the column numbers of 'Role_progress' and 'Role_status' should be modified in check_openstack_progress.sh Change-Id: I47607bfe3ab89195569f785b3f815e57cee0406d Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-04-05Merge "enable ceph backend for deploy cinder"Zhijiang Hu4-3/+30
2017-03-31enable ceph backend for deploy cinderzhouya4-3/+30
Change-Id: I71255872e6bcf485f8ab72c105db931d96233d03 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-03-30add tox framework for pep8 and unittestSerenaFeng9-0/+87
Change-Id: If783d387c29dad7fa472578ead2bcd5a6d42ee70 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-03-28Merge "unify the way of obtaining network configuration"Zhijiang Hu2-10/+2
2017-03-28Merge "Fix bug in virtual deploy"Zhijiang Hu2-1/+3
2017-03-26Fix bug in virtual deployAlex Yang2-1/+3
In prepare_install function of tempest.py: 1. get_config.py needs dha and network parameters 2. install_os_for_vm_step2 function needs cluster_id parameter Change-Id: Idb13f71ced76f0d99dcbe818cdac3d3f2eb7d5df Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-03-24unify the way of obtaining network configurationSerenaFeng2-10/+2
Change-Id: Idd960d7faf0f24ae8caac13562858ccaa1c67f7b Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-03-24unify the way of getting openstack clientsSerenaFeng4-12/+15
Change-Id: If3a1d1a8b74e11c5861c016bd722b78f4cf9b475 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-03-23Merge "modify image path according to https://review.openstack.org/#/c/446820/"Zhijiang Hu1-1/+1
2017-03-23modify image pathYao Lu1-1/+1
according to https://review.openstack.org/#/c/446820/ Change-Id: Ie5ece043ac27e207e232cb05b8b007fa6c1b04c5 Signed-off-by: Yao Lu <lu.yao135@zte.com.cn>
2017-03-23simplify get_xx process using query.find()SerenaFeng3-21/+15
Change-Id: I2a911fc15c1456b409db840b9ae76c04a23d449d Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-03-23Merge "add missing license"Zhijiang Hu6-0/+50
2017-03-23Merge "abolish tag to use branch to get daisy from upstream"Zhijiang Hu1-2/+1
2017-03-23Merge "bugfix hardcoded network configuration"Zhijiang Hu4-17/+125
2017-03-23Merge "use local cirros image in post-deploy script"Zhijiang Hu1-1/+1
2017-03-22abolish tag to use branch to get daisy from upstreamzhouya1-2/+1
Change-Id: I3bcc1e6d9cbcb2974fc9246a3b1559f9b988d530 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-03-21add missing licenseSerenaFeng6-0/+50
Change-Id: Ie187f76db9ae7518c4fb129b4571cedbd7d931c6 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-03-21bugfix hardcoded network configurationSerenaFeng4-17/+125
Change-Id: I1fb6036a2805ccb9bdbe23622514ccd9d997c1a5 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-03-20use local cirros image in post-deploy scriptAlex Yang1-1/+1
In daisy building job, cirros image is packed in daisy image file. And it would be copied to /var/lib/daisy/images/ directory after daisy installed. The post-deploy script can use it locally. Change-Id: I45adbdd8b7c87b574367820076f6019638310ed8 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-03-17distinguish virtual and bm deployzhouya3-16/+26
Change-Id: I9fcc4f08283c832d32c22c2195401dd86ecf9dc5 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-03-16Merge "download and pack cirros image into opnfv.bin"Zhijiang Hu2-0/+17
2017-03-16Merge "unify the definition of NETWORK and NETWORK_CONF"Zhijiang Hu1-9/+2