daisy.git
8 years agoAdd network name and update gateway of ext-net of baremetal env 31/35431/1
Alex Yang [Sat, 27 May 2017 02:50:50 +0000 (10:50 +0800)]
Add network name and update gateway of ext-net of baremetal env

The configurations in securedlab has already been updated.

Change-Id: I663c3c8a9bac7fe8ef1a5d16018f9c848ca5427c
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
8 years agoadd prepare and post process for baremental deployment 99/35399/1
SerenaFeng [Fri, 26 May 2017 09:31:54 +0000 (17:31 +0800)]
add prepare and post process for baremental deployment

Change-Id: I3026c4dd83cc19246c19ab568005c4c0b37ff9d9
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
8 years agoMerge "Use unified vm template files in python deploy script"
Zhijiang Hu [Thu, 25 May 2017 11:10:14 +0000 (11:10 +0000)]
Merge "Use unified vm template files in python deploy script"

8 years agoRemove the incomplete file and re-download it 11/35311/2
Alex Yang [Thu, 25 May 2017 07:02:43 +0000 (15:02 +0800)]
Remove the incomplete file and re-download it

The kolla file downloaded on the ci node may be incomplete.

Change-Id: Id15695504bd29f31178054b5e8cc83d8612543d9
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
8 years agoUse unified vm template files in python deploy script 15/35015/6
Alex Yang [Fri, 19 May 2017 01:19:17 +0000 (09:19 +0800)]
Use unified vm template files in python deploy script

Change-Id: I386011a35a9be3e4f1d468744a6945360bb2adb3
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
8 years agoMerge "Code optimization for list traversal"
Zhijiang Hu [Thu, 25 May 2017 03:46:31 +0000 (03:46 +0000)]
Merge "Code optimization for list traversal"

8 years agoMerge "enlarge the ram of all_in_one node"
Zhijiang Hu [Thu, 25 May 2017 03:45:43 +0000 (03:45 +0000)]
Merge "enlarge the ram of all_in_one node"

8 years agoAdd dependencies for ocata version into docker file 01/35301/1
Alex Yang [Thu, 25 May 2017 03:34:30 +0000 (11:34 +0800)]
Add dependencies for ocata version into docker file

Change-Id: I3dc81449293a00b5b095ecea8a48a0cdb03cd4e8
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
8 years agoenlarge the ram of all_in_one node 55/35255/1
Alex Yang [Wed, 24 May 2017 06:34:39 +0000 (14:34 +0800)]
enlarge the ram of all_in_one node

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>
8 years agosupport ocata openstack, keep up with the upstream 67/35167/4
Alex Yang [Tue, 23 May 2017 02:25:10 +0000 (10:25 +0800)]
support ocata openstack, keep up with the upstream

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>
8 years agoCode optimization for list traversal 13/35013/1
zhongjun [Fri, 19 May 2017 00:52:41 +0000 (08:52 +0800)]
Code optimization for list traversal

1.replace the list to generator to simply the code.

Change-Id: Ia67cf265f3ca004eab5abb8b1d742f53b7d554ad
Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
8 years agoadd separated disk for ceph in multi-nodes virtual deploy 29/34629/2
Alex Yang [Thu, 11 May 2017 16:08:01 +0000 (00:08 +0800)]
add separated disk for ceph in multi-nodes virtual deploy

Change-Id: Ic3f67bb889c20e95916a1052f0cfa1e238f133a8
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
8 years agoMerge "refacort deploy.yml and add jsonschema to validate it"
Zhijiang Hu [Mon, 15 May 2017 03:53:31 +0000 (03:53 +0000)]
Merge "refacort deploy.yml and add jsonschema to validate it"

8 years agoKill git-version-gen 29/34729/1
Zhijiang Hu [Sat, 13 May 2017 09:39:57 +0000 (17:39 +0800)]
Kill git-version-gen

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>
8 years agorefacort deploy.yml and add jsonschema to validate it 65/34465/2
Alex Yang [Tue, 9 May 2017 03:11:53 +0000 (11:11 +0800)]
refacort deploy.yml and add jsonschema to validate it

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>
8 years agoCompatible with the no mapping in network.yml 09/34409/1
zhongjun [Mon, 8 May 2017 02:26:00 +0000 (10:26 +0800)]
Compatible with the no mapping in network.yml

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>
8 years agoMerge "Hardcoded physnet1 changed to obtain from .yml"
Zhijiang Hu [Fri, 5 May 2017 06:42:19 +0000 (06:42 +0000)]
Merge "Hardcoded physnet1 changed to obtain from .yml"

8 years agoMerge "Increase PACKETS_PER_BUFFER to 65536"
Zhijiang Hu [Fri, 5 May 2017 06:41:45 +0000 (06:41 +0000)]
Merge "Increase PACKETS_PER_BUFFER to 65536"

8 years agoMerge "Implement the deployment script with python"
Zhijiang Hu [Fri, 5 May 2017 00:39:49 +0000 (00:39 +0000)]
Merge "Implement the deployment script with python"

8 years agoIncrease PACKETS_PER_BUFFER to 65536 95/34195/4
Zhijiang Hu [Thu, 4 May 2017 04:55:33 +0000 (00:55 -0400)]
Increase PACKETS_PER_BUFFER to 65536

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>
8 years agoHardcoded physnet1 changed to obtain from .yml 65/33965/5
zhongjun [Thu, 27 Apr 2017 14:15:40 +0000 (22:15 +0800)]
Hardcoded physnet1 changed to obtain from .yml

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>
8 years agoImplement the deployment script with python 17/33817/6
Alex Yang [Wed, 26 Apr 2017 06:14:43 +0000 (14:14 +0800)]
Implement the deployment script with python

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>
8 years agoMerge "Print out error message of docker commands"
Zhijiang Hu [Wed, 26 Apr 2017 15:47:35 +0000 (15:47 +0000)]
Merge "Print out error message of docker commands"

8 years agoPrint out error message of docker commands 51/33751/1
Zhijiang Hu [Tue, 25 Apr 2017 09:04:04 +0000 (05:04 -0400)]
Print out error message of docker commands

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>
8 years agomodify daisy.conf sleep long for trustme modify cpumode 45/33745/5
zhouya [Tue, 25 Apr 2017 06:42:01 +0000 (14:42 +0800)]
modify daisy.conf sleep long for trustme modify cpumode

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>
8 years agoMerge "ignore the git history in daisy building job"
Zhijiang Hu [Tue, 25 Apr 2017 03:22:03 +0000 (03:22 +0000)]
Merge "ignore the git history in daisy building job"

8 years agoignore the git history in daisy building job 33/33733/1
Alex Yang [Tue, 25 Apr 2017 02:02:49 +0000 (10:02 +0800)]
ignore the git history in daisy building job

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>
8 years agoUnify the kolla config in py 83/33683/2
zhongjun [Mon, 24 Apr 2017 02:32:51 +0000 (10:32 +0800)]
Unify the kolla config in py

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>
8 years agoSolve "Buffer I/O error on dev loop0p1" error message 07/33507/1
Zhijiang Hu [Wed, 19 Apr 2017 07:38:48 +0000 (03:38 -0400)]
Solve "Buffer I/O error on dev loop0p1" error message

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>
8 years agoMerge "The image file is deleted mistakenly"
Zhijiang Hu [Mon, 17 Apr 2017 07:59:56 +0000 (07:59 +0000)]
Merge "The image file is deleted mistakenly"

8 years agoMerge "Modify the log message in deploy script"
Zhijiang Hu [Mon, 17 Apr 2017 06:09:13 +0000 (06:09 +0000)]
Merge "Modify the log message in deploy script"

8 years agoMerge "Treat bad command line usage as error"
Zhijiang Hu [Mon, 17 Apr 2017 06:08:38 +0000 (06:08 +0000)]
Merge "Treat bad command line usage as error"

8 years agoThe image file is deleted mistakenly 95/33395/1
Alex Yang [Sat, 15 Apr 2017 18:18:38 +0000 (02:18 +0800)]
The image file is deleted mistakenly

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>
8 years agoModify the log message in deploy script 97/32697/6
Alex Yang [Mon, 10 Apr 2017 08:10:34 +0000 (16:10 +0800)]
Modify the log message in deploy script

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>
8 years agoTreat bad command line usage as error 91/33391/1
Zhijiang Hu [Sat, 15 Apr 2017 09:20:11 +0000 (05:20 -0400)]
Treat bad command line usage as error

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>
8 years agoMerge "add the argument WORKDIR in daisy-img-modify.sh"
Zhijiang Hu [Sat, 15 Apr 2017 07:46:07 +0000 (07:46 +0000)]
Merge "add the argument WORKDIR in daisy-img-modify.sh"

8 years agoadd the argument WORKDIR in daisy-img-modify.sh 27/33327/2
zhongjun [Thu, 13 Apr 2017 07:14:45 +0000 (15:14 +0800)]
add the argument WORKDIR in daisy-img-modify.sh

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>
8 years agoMerge "support mutinode deploy in vm deployment env"
Zhijiang Hu [Fri, 14 Apr 2017 05:47:21 +0000 (05:47 +0000)]
Merge "support mutinode deploy in vm deployment env"

8 years agoMerge "Nominating Alex Yang <yangyang1@zte.com.cn> as committer for Daisy4NFV project."
Zhijiang Hu [Fri, 14 Apr 2017 00:34:50 +0000 (00:34 +0000)]
Merge "Nominating Alex Yang <yangyang1@zte.com.cn> as committer for Daisy4NFV project."

8 years agoNominating Alex Yang <yangyang1@zte.com.cn> as committer for Daisy4NFV project. 65/31965/2
Zhijiang Hu [Tue, 28 Mar 2017 04:20:57 +0000 (00:20 -0400)]
Nominating Alex Yang <yangyang1@zte.com.cn> as committer for Daisy4NFV project.

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>
8 years agosupport mutinode deploy in vm deployment env 47/33147/9
zhouya [Sat, 8 Apr 2017 07:48:40 +0000 (15:48 +0800)]
support mutinode deploy in vm deployment env

Change-Id: Ic9e19d4e120fc53d96d0794239cd6e421f25ea27
Signed-off-by: zhouya <zhou.ya@zte.com.cn>
8 years agoAdd rpm based installation doc 15/33215/1
Zhijiang Hu [Tue, 11 Apr 2017 02:44:35 +0000 (22:44 -0400)]
Add rpm based installation doc

Change-Id: I50d5750e985b258cef7874c88902b8fae0539e25
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
8 years agoMerge "Add required packages for build jasmine"
Zhijiang Hu [Mon, 10 Apr 2017 09:46:00 +0000 (09:46 +0000)]
Merge "Add required packages for build jasmine"

8 years agoAdd required packages for build jasmine 77/33177/2
Zhijiang Hu [Mon, 10 Apr 2017 09:20:24 +0000 (05:20 -0400)]
Add required packages for build jasmine

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>
8 years agomodify service name in service disk table 81/33181/1
zhouya [Mon, 10 Apr 2017 08:45:48 +0000 (16:45 +0800)]
modify service name in service disk table

Change-Id: Ic33381ef3339bdcec82cba7afbfc2d32f6e88be4
Signed-off-by: zhouya <zhou.ya@zte.com.cn>
8 years agoMerge "code variable name refactor"
Zhijiang Hu [Mon, 10 Apr 2017 07:57:13 +0000 (07:57 +0000)]
Merge "code variable name refactor"

8 years agocode variable name refactor 91/32391/2
zhongjun [Thu, 30 Mar 2017 07:02:12 +0000 (15:02 +0800)]
code variable name refactor

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>
8 years agojasmine(Just A Simple Multicast engINE) Initial merge 93/33093/4 v1.0.2
Zhijiang Hu [Fri, 7 Apr 2017 03:21:42 +0000 (23:21 -0400)]
jasmine(Just A Simple Multicast engINE) Initial merge

Change-Id: I7a543019c8d92314ef549bf72369b7276f39577d
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
8 years agoMerge "Add multicast spec"
Zhijiang Hu [Fri, 7 Apr 2017 01:36:45 +0000 (01:36 +0000)]
Merge "Add multicast spec"

8 years agoAdd multicast spec 09/32709/9
Zhijiang Hu [Fri, 31 Mar 2017 08:39:29 +0000 (04:39 -0400)]
Add multicast spec

Change-Id: I3f9b9167864126b7b455761799dc79c40c394854
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
8 years agoMerge "delete redundant parameters in cluster_meta"
Zhijiang Hu [Thu, 6 Apr 2017 09:41:56 +0000 (09:41 +0000)]
Merge "delete redundant parameters in cluster_meta"

8 years agodelete redundant parameters in cluster_meta 29/33029/1
zhouya [Thu, 6 Apr 2017 02:46:30 +0000 (10:46 +0800)]
delete redundant parameters in cluster_meta

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>
8 years agoGet the right columns according to the upstream patch 23/33023/1
Alex Yang [Thu, 6 Apr 2017 01:23:38 +0000 (09:23 +0800)]
Get the right columns according to the upstream patch

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>
8 years agoMerge "enable ceph backend for deploy cinder"
Zhijiang Hu [Wed, 5 Apr 2017 09:15:30 +0000 (09:15 +0000)]
Merge "enable ceph backend for deploy cinder"

8 years agoenable ceph backend for deploy cinder 03/31903/4
zhouya [Mon, 27 Mar 2017 12:06:37 +0000 (20:06 +0800)]
enable ceph backend for deploy cinder

Change-Id: I71255872e6bcf485f8ab72c105db931d96233d03
Signed-off-by: zhouya <zhou.ya@zte.com.cn>
8 years agoadd tox framework for pep8 and unittest 69/32469/3
SerenaFeng [Thu, 30 Mar 2017 11:26:06 +0000 (19:26 +0800)]
add tox framework for pep8 and unittest

Change-Id: If783d387c29dad7fa472578ead2bcd5a6d42ee70
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
8 years agoMerge "unify the way of obtaining network configuration"
Zhijiang Hu [Tue, 28 Mar 2017 02:23:41 +0000 (02:23 +0000)]
Merge "unify the way of obtaining network configuration"

8 years agoMerge "Fix bug in virtual deploy"
Zhijiang Hu [Tue, 28 Mar 2017 02:23:05 +0000 (02:23 +0000)]
Merge "Fix bug in virtual deploy"

8 years agoFix bug in virtual deploy 89/31789/1
Alex Yang [Sun, 26 Mar 2017 14:01:43 +0000 (22:01 +0800)]
Fix bug in virtual deploy

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>
8 years agounify the way of obtaining network configuration 61/31661/1
SerenaFeng [Fri, 24 Mar 2017 06:51:32 +0000 (14:51 +0800)]
unify the way of obtaining network configuration

Change-Id: Idd960d7faf0f24ae8caac13562858ccaa1c67f7b
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
8 years agounify the way of getting openstack clients 59/31659/2
SerenaFeng [Fri, 24 Mar 2017 06:43:04 +0000 (14:43 +0800)]
unify the way of getting openstack clients

Change-Id: If3a1d1a8b74e11c5861c016bd722b78f4cf9b475
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
8 years agoMerge "modify image path according to https://review.openstack.org/#/c/446820/"
Zhijiang Hu [Thu, 23 Mar 2017 15:21:10 +0000 (15:21 +0000)]
Merge "modify image path according to https://review.openstack.org/#/c/446820/"

8 years agomodify image path 59/31559/2
Yao Lu [Thu, 23 Mar 2017 11:45:04 +0000 (19:45 +0800)]
modify image path
according to https://review.openstack.org/#/c/446820/

Change-Id: Ie5ece043ac27e207e232cb05b8b007fa6c1b04c5
Signed-off-by: Yao Lu <lu.yao135@zte.com.cn>
8 years agosimplify get_xx process using query.find() 61/30661/9
SerenaFeng [Thu, 16 Mar 2017 08:59:48 +0000 (16:59 +0800)]
simplify get_xx process using query.find()

Change-Id: I2a911fc15c1456b409db840b9ae76c04a23d449d
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
8 years agoMerge "add missing license"
Zhijiang Hu [Thu, 23 Mar 2017 02:06:28 +0000 (02:06 +0000)]
Merge "add missing license"

8 years agoMerge "abolish tag to use branch to get daisy from upstream"
Zhijiang Hu [Thu, 23 Mar 2017 02:05:41 +0000 (02:05 +0000)]
Merge "abolish tag to use branch to get daisy from upstream"

8 years agoMerge "bugfix hardcoded network configuration"
Zhijiang Hu [Thu, 23 Mar 2017 02:04:10 +0000 (02:04 +0000)]
Merge "bugfix hardcoded network configuration"

8 years agoMerge "use local cirros image in post-deploy script"
Zhijiang Hu [Thu, 23 Mar 2017 02:03:42 +0000 (02:03 +0000)]
Merge "use local cirros image in post-deploy script"

8 years agoabolish tag to use branch to get daisy from upstream 31/31331/2
zhouya [Wed, 22 Mar 2017 08:18:30 +0000 (16:18 +0800)]
abolish tag to use branch to get daisy from upstream

Change-Id: I3bcc1e6d9cbcb2974fc9246a3b1559f9b988d530
Signed-off-by: zhouya <zhou.ya@zte.com.cn>
8 years agoadd missing license 85/31185/2
SerenaFeng [Tue, 21 Mar 2017 11:19:58 +0000 (19:19 +0800)]
add missing license

Change-Id: Ie187f76db9ae7518c4fb129b4571cedbd7d931c6
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
8 years agobugfix hardcoded network configuration 53/30653/4
SerenaFeng [Thu, 16 Mar 2017 07:16:12 +0000 (15:16 +0800)]
bugfix hardcoded network configuration

Change-Id: I1fb6036a2805ccb9bdbe23622514ccd9d997c1a5
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
8 years agouse local cirros image in post-deploy script 55/30755/2
Alex Yang [Fri, 17 Mar 2017 00:57:39 +0000 (08:57 +0800)]
use local cirros image in post-deploy script

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>
8 years agodistinguish virtual and bm deploy 09/30609/9
zhouya [Thu, 16 Mar 2017 01:36:20 +0000 (09:36 +0800)]
distinguish virtual and bm deploy

Change-Id: I9fcc4f08283c832d32c22c2195401dd86ecf9dc5
Signed-off-by: zhouya <zhou.ya@zte.com.cn>
8 years agoMerge "download and pack cirros image into opnfv.bin"
Zhijiang Hu [Thu, 16 Mar 2017 08:03:13 +0000 (08:03 +0000)]
Merge "download and pack cirros image into opnfv.bin"

8 years agoMerge "unify the definition of NETWORK and NETWORK_CONF"
Zhijiang Hu [Thu, 16 Mar 2017 07:59:02 +0000 (07:59 +0000)]
Merge "unify the definition of NETWORK and NETWORK_CONF"

8 years agoMerge "refactor set default_floating_pool"
Zhijiang Hu [Thu, 16 Mar 2017 07:36:13 +0000 (07:36 +0000)]
Merge "refactor set default_floating_pool"

8 years agoMerge "set 'trusts' auth model in heat"
Zhijiang Hu [Thu, 16 Mar 2017 07:35:42 +0000 (07:35 +0000)]
Merge "set 'trusts' auth model in heat"

8 years agodownload and pack cirros image into opnfv.bin 51/30651/1
Alex Yang [Thu, 16 Mar 2017 06:53:35 +0000 (14:53 +0800)]
download and pack cirros image into opnfv.bin

In daisy-build job, download and pack cirros 0.3.5 image into daisy
image file. Then post-deploy script can use it as a glance image.
It will locate in /var/lib/daisy/images/ on daisy server.

Change-Id: I1bf67c32bd245b43dd50974076daaca04721bc11
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
8 years agounify the definition of NETWORK and NETWORK_CONF 33/30633/1
SerenaFeng [Thu, 16 Mar 2017 04:15:37 +0000 (12:15 +0800)]
unify the definition of NETWORK and NETWORK_CONF

Change-Id: I1669c92f24739812a4e2d47655b1fc0a1daa3171
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
8 years agorefactor set default_floating_pool 27/30627/1
SerenaFeng [Thu, 16 Mar 2017 03:02:22 +0000 (11:02 +0800)]
refactor set default_floating_pool

Change-Id: I2e59f1ea7abdfc2bbd1f89cb19d55dd4eb053112
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
8 years agoset 'trusts' auth model in heat 19/30519/6
SerenaFeng [Wed, 15 Mar 2017 07:50:35 +0000 (15:50 +0800)]
set 'trusts' auth model in heat

Change-Id: I2b61d756adbeef0efecb2a9d479e8c43c56c21fb
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
8 years agocreate default TestVM for Functest 01/30401/3
SerenaFeng [Tue, 14 Mar 2017 08:48:22 +0000 (16:48 +0800)]
create default TestVM for Functest

Change-Id: I505a0819d5f1a4350e82ceaa9e5cbee285c8fba0
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
8 years agoMerge "bugfix: test_external_network_visibility failed"
Zhijiang Hu [Wed, 15 Mar 2017 14:37:21 +0000 (14:37 +0000)]
Merge "bugfix: test_external_network_visibility failed"

8 years agoMerge "add default_floating_pool configuration for nova-api"
Zhijiang Hu [Wed, 15 Mar 2017 14:28:04 +0000 (14:28 +0000)]
Merge "add default_floating_pool configuration for nova-api"

8 years agoMerge "create m1.micro flavor for functest"
Zhijiang Hu [Wed, 15 Mar 2017 14:17:31 +0000 (14:17 +0000)]
Merge "create m1.micro flavor for functest"

8 years agobugfix: test_external_network_visibility failed 41/30541/1
SerenaFeng [Wed, 15 Mar 2017 09:11:02 +0000 (17:11 +0800)]
bugfix: test_external_network_visibility failed

subnet should be invisible

Change-Id: I27d7a9ceab3604ccd35667b949e490e341f95f6a
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
8 years agoadd default_floating_pool configuration for nova-api 07/30507/3
SerenaFeng [Wed, 15 Mar 2017 06:31:36 +0000 (14:31 +0800)]
add default_floating_pool configuration for nova-api

Change-Id: I9db5509667e9c10a9c07b55531c6d78fb95cc223
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
8 years agocreate m1.micro flavor for functest 05/30405/2
SerenaFeng [Tue, 14 Mar 2017 09:53:45 +0000 (17:53 +0800)]
create m1.micro flavor for functest

Change-Id: Iacb36cb05e72b0755cec0a5bd5a6c48f3ec70c6f
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
8 years agomodify daisy install interface and modify check_openstack_progress targetnode nums 87/30387/1
zhouya [Tue, 14 Mar 2017 06:59:35 +0000 (14:59 +0800)]
modify daisy install interface and modify check_openstack_progress targetnode nums

Change-Id: I19f8c18f8b977619c9bbf6f1e80f7c48f8f5db9e
Signed-off-by: zhouya <zhou.ya@zte.com.cn>
8 years agoremove blanks from cluster_id 01/30301/1
Alex Yang [Sat, 11 Mar 2017 15:52:14 +0000 (23:52 +0800)]
remove blanks from cluster_id

There are blanks at the head and the tail of $cluster_id. Then in
https://build.opnfv.org/ci/job/daisy-deploy-virtual-daily-master/26/console
there are error messages as "No such file or directory".

Change-Id: Ia5d119df85d4f64fbc3a47705ccc208d7a67b2de
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
8 years agoMerge "add known_hosts file in daisy vm"
Zhijiang Hu [Fri, 10 Mar 2017 08:56:35 +0000 (08:56 +0000)]
Merge "add known_hosts file in daisy vm"

8 years agoMerge "Fix ipmi info updating in OS installation"
Zhijiang Hu [Fri, 10 Mar 2017 08:46:02 +0000 (08:46 +0000)]
Merge "Fix ipmi info updating in OS installation"

8 years agoadd known_hosts file in daisy vm 29/30229/1
zhouya [Fri, 10 Mar 2017 08:26:33 +0000 (16:26 +0800)]
add known_hosts file in daisy vm

Change-Id: Icc58c1ad41264557ad462174188f518fbb1f5ef6
Signed-off-by: zhouya <zhou.ya@zte.com.cn>
8 years agoEliminate the exception in image-modify 79/29979/3
Alex Yang [Tue, 7 Mar 2017 16:30:24 +0000 (00:30 +0800)]
Eliminate the exception in image-modify

Sometimes kpartx fails when it deletes the partition device mappings
because of the automatic mounting to /run/media/root/xxxx. So umounting
and removing forcibly are needed.

Change-Id: Ic8a19ef9139adb9c0c5c4bead0ae0ffbd92f24b8
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
8 years agoFix ipmi info updating in OS installation 57/30157/1
Alex Yang [Thu, 9 Mar 2017 11:51:57 +0000 (19:51 +0800)]
Fix ipmi info updating in OS installation

1. No need for virtual deploy to update ipmi info
2. Print host details in virtual deploy

Change-Id: Ie1f16f869440191458c7f672fc3cea2393b76245
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
8 years agoMerge "create admin external subnet"
Zhijiang Hu [Thu, 9 Mar 2017 08:04:09 +0000 (08:04 +0000)]
Merge "create admin external subnet"

8 years agoMerge "add patch from upstream to fit bm deploy"
Zhijiang Hu [Thu, 9 Mar 2017 06:39:06 +0000 (06:39 +0000)]
Merge "add patch from upstream to fit bm deploy"

8 years agoMerge "fix libvirt bug of https://bugzilla.redhat.com/show_bug.cgi?id=1404627"
Zhijiang Hu [Thu, 9 Mar 2017 06:33:07 +0000 (06:33 +0000)]
Merge "fix libvirt bug of https://bugzilla.redhat.com/show_bug.cgi?id=1404627"

8 years agoadd patch from upstream to fit bm deploy 25/30025/1
zhouya [Wed, 8 Mar 2017 07:53:05 +0000 (15:53 +0800)]
add patch from upstream to fit bm deploy

Change-Id: Iefba02c658f7feb45868822334deada245b1d7aa
Signed-off-by: zhouya <zhou.ya@zte.com.cn>
8 years agofix libvirt bug of https://bugzilla.redhat.com/show_bug.cgi?id=1404627 41/29941/4
zhouya [Tue, 7 Mar 2017 11:52:08 +0000 (19:52 +0800)]
fix libvirt bug of https://bugzilla.redhat.com/show_bug.cgi?id=1404627

Change-Id: Ia018529ed3ca89e883a8ba2b1a693e2a5250af21
Signed-off-by: zhouya <zhou.ya@zte.com.cn>