daisy.git
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 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>
8 years agoMerge "create external network"
Zhijiang Hu [Wed, 8 Mar 2017 02:21:57 +0000 (02:21 +0000)]
Merge "create external network"

8 years agocreate admin external subnet 05/29905/3
SerenaFeng [Tue, 7 Mar 2017 06:36:03 +0000 (14:36 +0800)]
create admin external subnet

Change-Id: Ib56c94c090fd2fc0950ce97e1c4c1fdf622f2d08
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
8 years agocreate external network 99/29899/3
SerenaFeng [Tue, 7 Mar 2017 02:43:56 +0000 (10:43 +0800)]
create external network

Change-Id: I6621fed21832f3e4653c2d236bb29de421b5b573
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
8 years agoFix judging condition flaw 47/29647/3
Julien-zte [Thu, 2 Mar 2017 13:11:17 +0000 (21:11 +0800)]
Fix judging condition flaw

*the judging condition var is $volumes_to_remove instead of
$containers_to_kill at line 95 in kolla-build.sh

*unify the code indent

Change-Id: Ia6722d32f98fbee938e4eb6f1be0cedd3dc38aa8
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
8 years agoMerge "fix some bug of bm deploy"
Zhijiang Hu [Tue, 7 Mar 2017 01:43:41 +0000 (01:43 +0000)]
Merge "fix some bug of bm deploy"

8 years agoMerge "add framework of post deploy process"
Zhijiang Hu [Tue, 7 Mar 2017 01:43:27 +0000 (01:43 +0000)]
Merge "add framework of post deploy process"

8 years agofix some bug of bm deploy 95/29595/4
zhouya [Thu, 2 Mar 2017 02:41:15 +0000 (10:41 +0800)]
fix some bug of bm deploy

Change-Id: I96bed7259666d48a1fbc41bb9452d8493c4417b8
Signed-off-by: zhouya <zhou.ya@zte.com.cn>
8 years agoadd framework of post deploy process 15/29715/2
SerenaFeng [Fri, 3 Mar 2017 10:34:16 +0000 (18:34 +0800)]
add framework of post deploy process

Change-Id: I3f5a067a6359be482a853b164fd7effdfad8fc8f
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
8 years agoMerge "fix some typos in .rst files"
Zhijiang Hu [Fri, 3 Mar 2017 09:04:41 +0000 (09:04 +0000)]
Merge "fix some typos in .rst files"

8 years agoMerge "End deployment when timeout"
Zhijiang Hu [Fri, 3 Mar 2017 09:03:20 +0000 (09:03 +0000)]
Merge "End deployment when timeout"

8 years agoFix an error in docker volume remove 37/29637/1
Alex Yang [Thu, 2 Mar 2017 12:20:01 +0000 (20:20 +0800)]
Fix an error in docker volume remove

Replace $containers_to_kill with $volumes_to_remove in docker
volumes removing.

Change-Id: I715ff135099be0a8c9424ab3f94509ee72558415
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
8 years agoEnd deployment when timeout 35/29635/1
Alex Yang [Thu, 2 Mar 2017 12:08:35 +0000 (20:08 +0800)]
End deployment when timeout

Change-Id: Iaae02bfc69450d6138b7b187ec23e4ed2eef6138
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
8 years agofix some typos in .rst files 19/29419/2
zhongjun [Mon, 27 Feb 2017 17:14:42 +0000 (01:14 +0800)]
fix some typos in .rst files

*Correct some typos in vmdeploy.rst
*Correct some typos in installation_guide.rst

Change-Id: I1b395ecbc0f4b5e5e47a056eebc3a1b9fd0e4347
Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
8 years agoFix daisycloud-core to a specific tag 75/29475/1
Zhijiang [Tue, 28 Feb 2017 11:18:39 +0000 (06:18 -0500)]
Fix daisycloud-core to a specific tag

Change-Id: Ife00fdc3409711f8d2de54f03a2a48f778761f80
Signed-off-by: Zhijiang <hu.zhijiang@zte.com.cn>
8 years agoMake opnfv.bin executable 79/29379/1
Alex Yang [Sat, 25 Feb 2017 10:04:42 +0000 (18:04 +0800)]
Make opnfv.bin executable

The downloaded opnfv.bin file has no executable attribute, although
it has +x in building-job.

Change-Id: I38347db6de2630e0a92106df22b027efa20d4498
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
8 years agoMerge "spelling check:artifacts repository->artifact repository"
Zhijiang Hu [Fri, 24 Feb 2017 07:20:24 +0000 (07:20 +0000)]
Merge "spelling check:artifacts repository->artifact repository"

8 years agoCorrect the type error of env CLI Option in tempest.py 19/29319/2
Alex Yang [Fri, 24 Feb 2017 01:36:32 +0000 (09:36 +0800)]
Correct the type error of env CLI Option in tempest.py

Change-Id: Id7a4f567c7c81e17c33b5c3ba558fa1cc891b42d
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
8 years agospelling check:artifacts repository->artifact repository 23/29323/1
zhongjun [Thu, 23 Feb 2017 09:32:40 +0000 (17:32 +0800)]
spelling check:artifacts repository->artifact repository

Change-Id: I69d5d07e61e3b8aef0a8ecbecfe6828e2361ba66
Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
8 years agoMerge "Baremetal Deployment on zte-pod2 JIRA: DAISY-30"
Zhijiang Hu [Thu, 23 Feb 2017 00:54:36 +0000 (00:54 +0000)]
Merge "Baremetal Deployment on zte-pod2 JIRA: DAISY-30"

8 years agoMerge "Add executable attribute to opnfv bin file"
Zhijiang Hu [Wed, 22 Feb 2017 09:19:06 +0000 (09:19 +0000)]
Merge "Add executable attribute to opnfv bin file"

8 years agoAdd executable attribute to opnfv bin file 05/29205/1
Alex Yang [Wed, 22 Feb 2017 08:57:37 +0000 (16:57 +0800)]
Add executable attribute to opnfv bin file

1. Add executable attribute to the build-output bin file
2. Determine whether the bin file exists and is excutable before deployment

Change-Id: I95b43c9efacfbd47a5f570dac793c0a8d3fe9bbb
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
8 years agoBaremetal Deployment on zte-pod2 47/28347/11
Zhou Ya [Thu, 9 Feb 2017 08:19:19 +0000 (16:19 +0800)]
Baremetal Deployment on zte-pod2
JIRA: DAISY-30

Change-Id: Ie34180b9d036797d310f612caa189b0a06efb732
Signed-off-by: Zhou Ya <zhou.ya@zte.com.cn>
8 years agomissing a $ bere var 83/29183/1
Julien [Wed, 22 Feb 2017 00:36:12 +0000 (08:36 +0800)]
missing a $ bere var

Change-Id: Ida548591f4e793bc28f4a8df31c07356cee9a82a
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
8 years agoAdd missing brackets 07/28907/1
Alex Yang [Fri, 17 Feb 2017 08:22:01 +0000 (16:22 +0800)]
Add missing brackets

Change-Id: Ia1f437cad2c4d42e72d4b53cdd6a4f7f00a29edf
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
8 years agoFix some typo mistakes 73/28773/2
Alex Yang [Thu, 16 Feb 2017 03:41:59 +0000 (11:41 +0800)]
Fix some typo mistakes

Change-Id: If85c06459cda8392827920928b7d65f7e70fc82b
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
8 years agoRefactor for get_para_from_deploy 39/28639/1
Julien [Tue, 14 Feb 2017 15:49:40 +0000 (23:49 +0800)]
Refactor for get_para_from_deploy

Change-Id: I6d8fb4df38bf0749222a2b967a76222c273a7549
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
8 years agorefactor for ssh call 23/28623/1
Julien [Tue, 14 Feb 2017 14:22:12 +0000 (22:22 +0800)]
refactor for ssh call

Be easy to understand

Change-Id: I385569342b96d21f8a9ac6bfb68c92ba424f03ae
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
8 years agoMerge "Use securedlab for configuration"
Zhijiang Hu [Tue, 14 Feb 2017 04:07:02 +0000 (04:07 +0000)]
Merge "Use securedlab for configuration"

8 years agoUse securedlab for configuration 85/28485/2
Julien [Mon, 6 Feb 2017 15:46:44 +0000 (23:46 +0800)]
Use securedlab for configuration

1. Use labname and podname to fetch configuration files;
2. Support dry-run, which just print the parameters passed without
physically deployment;
3. Add Bridge parameter from POD

JIRA: DAISY-40

Change-Id: I8cda3f47746d526f442b420a7a4101f84e9ad002
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
8 years agoMerge "Add parameters support for deploy"
Zhijiang Hu [Fri, 10 Feb 2017 08:12:15 +0000 (08:12 +0000)]
Merge "Add parameters support for deploy"

8 years agoMerge "Add basic installation guide docs"
Zhijiang Hu [Wed, 8 Feb 2017 04:11:47 +0000 (04:11 +0000)]
Merge "Add basic installation guide docs"

8 years agoResolve build silent failure 25/28225/5
Zhijiang Hu [Tue, 7 Feb 2017 12:53:08 +0000 (07:53 -0500)]
Resolve build silent failure

1) Add "-f" to docker rmi command, otherwise we encountered "Error
response from daemon: conflict: unable to remove repository ..."

2) Remove "2>&1" to get error message printed out if present.

3) Add cleanup_container, otherwise we got "Error response from
daemon: Conflict. The name "/daisy" is already in use by container"

Change-Id: Ic5cecb34699c6fbe0d3af45be38633d35bdfc89f
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
8 years agoAdd basic installation guide docs 69/28169/3
Zhijiang [Tue, 7 Feb 2017 05:43:12 +0000 (00:43 -0500)]
Add basic installation guide docs

Change-Id: I9ecb49ceee687b6488f8635544e46e854989d6a5
Signed-off-by: Zhijiang <hu.zhijiang@zte.com.cn>
8 years agoMerge "Add a judgment in trustme.sh"
Zhijiang Hu [Tue, 7 Feb 2017 01:38:51 +0000 (01:38 +0000)]
Merge "Add a judgment in trustme.sh"

8 years agoAdd a judgment in trustme.sh 47/27047/4
zhuzeyu [Mon, 16 Jan 2017 12:31:53 +0000 (20:31 +0800)]
Add a judgment in trustme.sh

To check whether the script runs successful

Change-Id: I0ae4e01d845690cb6c19f95f0950cd98ebd1338c
Signed-off-by: zhuzeyu <zhu.zeyu@zte.com.cn>
8 years agoAdd parameters support for deploy 59/28059/2
Julien [Sun, 5 Feb 2017 08:41:37 +0000 (16:41 +0800)]
Add parameters support for deploy

JIRA: DAISY-29

Change-Id: I53a08f2fa458028a59597d1b7a0c7b9137e40dd7
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
8 years agoMerge "add centos to /var/lib/daisy/kolla"
Zhijiang Hu [Thu, 19 Jan 2017 09:24:43 +0000 (09:24 +0000)]
Merge "add centos to /var/lib/daisy/kolla"

8 years agoremove centos7.qcow2 41/27141/3
Yao Lu [Wed, 18 Jan 2017 07:28:49 +0000 (15:28 +0800)]
remove centos7.qcow2
every time before deploy,we need new centos7.qcow2.

Change-Id: I295ed192674a31290b25042c0843875b93831ebc
Signed-off-by: Yao Lu <lu.yao135@zte.com.cn>
8 years agoadd centos to /var/lib/daisy/kolla 55/27155/2
Yao Lu [Wed, 18 Jan 2017 09:00:35 +0000 (17:00 +0800)]
add centos to /var/lib/daisy/kolla

Change-Id: Ifc160b5ae884c2ea7be481b31457752b0be44a71
Signed-off-by: Yao Lu <lu.yao135@zte.com.cn>
8 years agoUse different variables for local workspace and remote workspace 13/26913/1
Alex Yang [Thu, 12 Jan 2017 06:19:13 +0000 (14:19 +0800)]
Use different variables for local workspace and remote workspace

1. get local WORKSPACE from the script path
2. use REMOTE_SPACE for jumpserver, WORKSPACE for local
3. specify the vm storage directory

Change-Id: I7ff17d40819b6a74ce81862c32ce4a71b3eb8c73
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
8 years agoSimplify the steps in trustme.sh 85/26785/1
Alex Yang [Sun, 8 Jan 2017 14:45:12 +0000 (22:45 +0800)]
Simplify the steps in trustme.sh

Change-Id: Ic7432bd78225ba4d598eef0f283957a34e6401de
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
8 years agoMerge "Run docker from dockerhub"
Zhijiang Hu [Sat, 7 Jan 2017 01:04:10 +0000 (01:04 +0000)]
Merge "Run docker from dockerhub"

8 years agoMerge "clean up env before deploy"
Zhijiang Hu [Sat, 7 Jan 2017 01:02:23 +0000 (01:02 +0000)]
Merge "clean up env before deploy"

8 years agoRun docker from dockerhub 65/26665/5
Julien [Tue, 3 Jan 2017 16:42:01 +0000 (00:42 +0800)]
Run docker from dockerhub

1. Use the build image in releng;
2. Pull down the newest image and run;
3. Delete unused codes;

wait from docker image build(26449) and upload in the dockerhub

Change-Id: I72b072aff6cd905b426451768dc51d17eee6c0a3
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
8 years agoclean up env before deploy 53/26453/11
Zhou Ya [Fri, 23 Dec 2016 02:11:43 +0000 (10:11 +0800)]
clean up env before deploy

1、modify function param standarded
2、modify centos version
3、clean up net and host before deploy
4、modify daisyserver password and node size

Change-Id: I9cbf4c5ed9984b12941afc8e45dba216f2b5ee0d
Signed-off-by: Zhou Ya <zhou.ya@zte.com.cn>
8 years agoAdd ARG in Dockerfile 49/26449/2
Julien [Fri, 23 Dec 2016 00:40:57 +0000 (08:40 +0800)]
Add ARG in Dockerfile

build-arg requires a ARG define in Dockerfile.

Change-Id: Id895449f1d9d73ab70bd9958b8cc8cf2d92c5a3c
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
8 years agoMerge "fix "No space" error in docker building"
Zhijiang Hu [Tue, 3 Jan 2017 08:03:41 +0000 (08:03 +0000)]
Merge "fix "No space" error in docker building"

8 years agoMerge "Add git branch & tag info to version file"
Zhijiang Hu [Tue, 3 Jan 2017 08:02:14 +0000 (08:02 +0000)]
Merge "Add git branch & tag info to version file"

8 years agoMerge "Fix bug in removing docker containers and images"
Zhijiang Hu [Tue, 3 Jan 2017 08:01:59 +0000 (08:01 +0000)]
Merge "Fix bug in removing docker containers and images"

8 years agoMerge "fix interface get type in get_conf"
Zhijiang Hu [Tue, 3 Jan 2017 07:57:27 +0000 (07:57 +0000)]
Merge "fix interface get type in get_conf"

8 years agoMerge "set MANAGEMENT ip as null"
Zhijiang Hu [Tue, 3 Jan 2017 07:57:15 +0000 (07:57 +0000)]
Merge "set MANAGEMENT ip as null"

8 years agoFix bug in removing docker containers and images 53/26653/1
Alex Yang [Tue, 3 Jan 2017 03:37:21 +0000 (11:37 +0800)]
Fix bug in removing docker containers and images

1. "unexpected unclosed action in range" occurs in "docker inspect -f $ops ..."
2. "No such image" occurs in "docker rmi ..."

Change-Id: I1a1ae9441beb3739585c8f2dcb63029b16c0c2fe
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
8 years agofix interface get type in get_conf 13/26413/3
Zhou Ya [Thu, 22 Dec 2016 06:34:51 +0000 (14:34 +0800)]
fix interface get type in get_conf

to kill '[0]' in get_conf.py file

Change-Id: I82282ff8431bf3eb93746e505e18547929f20ed9
Signed-off-by: Zhou Ya <zhou.ya@zte.com.cn>
8 years agoset MANAGEMENT ip as null 17/26417/2
zhouya [Thu, 22 Dec 2016 07:17:27 +0000 (15:17 +0800)]
set MANAGEMENT ip as null

we have got MANAGEMENT ip from network.yml
section networks ip ranges part,so here is duplicated

Change-Id: I144a4c5b7e59a1ec1cb1b83a944752a3a1f4d65a
Signed-off-by: zhouya <zhou.ya@zte.com.cn>
8 years agomodify the fixed para to a more flexible way 29/26429/4
Zhou Ya [Thu, 22 Dec 2016 09:23:41 +0000 (17:23 +0800)]
modify the fixed para to a more flexible way

we could have many types of os version,such as centos7 and
centos6,we should not fix this into a hard way name,for we
can change the os_version

Change-Id: I3d0f12fbcd7d25369c782a8f4dd5008b702cecdd
Signed-off-by: Zhou Ya <zhou.ya@zte.com.cn>
8 years agoMerge "solve no file of known_hosts bug"
Zhijiang Hu [Sat, 31 Dec 2016 00:32:15 +0000 (00:32 +0000)]
Merge "solve no file of known_hosts bug"

8 years agosolve no file of known_hosts bug 95/26495/6
zhouya [Mon, 26 Dec 2016 12:59:03 +0000 (20:59 +0800)]
solve no file of known_hosts bug

Change-Id: If70e8765709d49a22a4f6c17ab4e2c4589fbf05a
Signed-off-by: zhouya <zhou.ya@zte.com.cn>
8 years agofix "No space" error in docker building 89/26589/1
Alex Yang [Thu, 29 Dec 2016 15:57:42 +0000 (23:57 +0800)]
fix "No space" error in docker building

The space of the /root directory in the docker image is only 10G.
"No space" occurs in docker building. So the tmp directory should be changed.

Change-Id: Idfa831bac88e2b8ea8e4312247611dc9a1dcda65
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
8 years agoAdd git branch & tag info to version file 97/26497/1
Zhijiang [Tue, 27 Dec 2016 04:29:28 +0000 (23:29 -0500)]
Add git branch & tag info to version file

Change-Id: I860bcb9d08a9590ed7902e33a925ec1412e67408
Signed-off-by: Zhijiang <hu.zhijiang@zte.com.cn>
8 years agoUpdate the url to download centos iso 43/26443/1
Alex Yang [Thu, 22 Dec 2016 16:25:07 +0000 (00:25 +0800)]
Update the url to download centos iso

The url http://ftp.osuosl.org/pub/centos/7/isos/x86_64/
CentOS-7-x86_64-Minimal-1511.iso is invalid now.
Only 1611 version can be downloaded from that website.
So the url should be modified.

Change-Id: I1208ddabf940fb711d871fb884b8b2a1d7213c27
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
8 years agoMerge "Fix build-args error in dockerfile"
Zhijiang Hu [Thu, 22 Dec 2016 09:02:46 +0000 (09:02 +0000)]
Merge "Fix build-args error in dockerfile"

8 years agoMerge "implement deploy on virthal pod"
Zhijiang Hu [Tue, 20 Dec 2016 07:29:16 +0000 (07:29 +0000)]
Merge "implement deploy on virthal pod"

8 years agoMerge "Use new Kolla image package format"
Zhijiang Hu [Tue, 20 Dec 2016 07:28:41 +0000 (07:28 +0000)]
Merge "Use new Kolla image package format"

8 years agoimplement deploy on virthal pod 53/25153/31
Yao Lu [Tue, 29 Nov 2016 14:39:37 +0000 (22:39 +0800)]
implement deploy on virthal pod

Change-Id: I600e21f0d36f37c75cac4ace5f7225e32ab93d56
Signed-off-by: Yao Lu <lu.yao135@zte.com.cn>
8 years agoUse new Kolla image package format 55/26055/3
Yao Lu [Fri, 16 Dec 2016 03:04:15 +0000 (11:04 +0800)]
Use new Kolla image package format

Change-Id: I542630e0eb26e6a0630683186a645642411009e1
Signed-off-by: Yao Lu <lu.yao135@zte.com.cn>
8 years agoMerge "fix interface definition in yml"
Zhijiang Hu [Tue, 20 Dec 2016 06:17:59 +0000 (06:17 +0000)]
Merge "fix interface definition in yml"

8 years agoMerge "Container image build script"
Zhijiang Hu [Mon, 19 Dec 2016 06:22:14 +0000 (06:22 +0000)]
Merge "Container image build script"

8 years agoContainer image build script 69/25669/14
Zhijiang [Thu, 8 Dec 2016 12:35:27 +0000 (07:35 -0500)]
Container image build script

JIRA: DAISY-17

Change-Id: I91a2e27be3eec1e6edc1b5ed2c9b2b91f15f7705
Signed-off-by: Zhijiang <hu.zhijiang@zte.com.cn>
8 years agofix interface definition in yml 55/26155/2
Julien [Sun, 18 Dec 2016 15:34:07 +0000 (23:34 +0800)]
fix interface definition in yml

1. use list for physic nics;
2. add physic and logic nic parameter in deploy.yml;
3. merge network plane in file deploy.yml and network.yml using the
keywork *network plane name* for better usage;

*network_map* will be deleted from the return result list in the future.

Change-Id: Ia5f3277ec0fe864b7a523162d3b53d650e04e2a3
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
8 years agoFix build-args error in dockerfile 37/26137/1
Julien [Sat, 17 Dec 2016 13:47:13 +0000 (21:47 +0800)]
Fix build-args error in dockerfile

Issue: "One or more build-args [BRANCH] were not consumed, failing build."
refer in:
https://build.opnfv.org/ci/view/daisy/job/daisy-docker-build-push-monitor-master/1/console

Change-Id: Ib26809b1bd23b9410a869a17157d45c852a89496
Signed-off-by: Julien-zte <zhang.jun3g@zte.com.cn>
8 years agoMove Dockerfile to ./docker path 01/25801/1
Julien [Mon, 12 Dec 2016 14:36:26 +0000 (22:36 +0800)]
Move Dockerfile to ./docker path

According to other projects(releng/jjb/releng/opnfv-docker.yml), all the
Dockerfiles are put in ./docker path.

The daisy docker build procedure will be seperated from daisy bin file
build procedure. The daisy docker will be directly used during the bin
build procedure. It will help to safe the build time.

A seperate job will be created in Jenkins to monitor the Docker changes
and will build the docker image.

Change-Id: Ib68ec3657d7296041aa9dc99f8e578cb0466679f
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
8 years agoMiss call cleanup_docker_image 03/25603/2
Julien [Wed, 7 Dec 2016 07:57:43 +0000 (15:57 +0800)]
Miss call cleanup_docker_image

1. The function 'cleanup_docker_image' is not called by mistake.
2. Use 'docker run --rm' means: docker will automatically delete the
containers. It's not necessary to call it in the end of bash file.
according to the log: 'No containers to cleanup.'

Change-Id: I67b9ff3ed193467669b80d5a19e36fd077af537d
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
8 years agoMerge "download and modify centos image"
Zhijiang Hu [Mon, 12 Dec 2016 01:35:54 +0000 (01:35 +0000)]
Merge "download and modify centos image"

8 years agoMerge "refactor get_conf"
Zhijiang Hu [Mon, 12 Dec 2016 01:07:39 +0000 (01:07 +0000)]
Merge "refactor get_conf"

8 years agoMerge "bash format"
Zhijiang Hu [Sat, 10 Dec 2016 03:48:25 +0000 (03:48 +0000)]
Merge "bash format"

8 years agodownload and modify centos image 19/25019/6
Alex Yang [Mon, 28 Nov 2016 15:04:44 +0000 (23:04 +0800)]
download and modify centos image

Change-Id: I1934fb75d5d7f4a50f44c06080fbcec4f6c81f02
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
8 years agorefactor get_conf 51/25651/5
Julien [Thu, 8 Dec 2016 03:06:46 +0000 (11:06 +0800)]
refactor get_conf

1. delete 'decorator' function, replaced by hostdecorator;
2. reduce unused parameters for functions and wrapters;
3. add a decorator maker for hosts and networks;

Change-Id: I77cdc19316e0b11f7853f31fa397da98350789c2
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
8 years agoMerge "fix yml define and wrong implementation"
Zhijiang Hu [Thu, 8 Dec 2016 09:15:16 +0000 (09:15 +0000)]
Merge "fix yml define and wrong implementation"

8 years agoMerge "modify spelling mistake"
Zhijiang Hu [Thu, 8 Dec 2016 09:04:51 +0000 (09:04 +0000)]
Merge "modify spelling mistake"

8 years agoMerge "add xml for virtual machine"
Zhijiang Hu [Thu, 8 Dec 2016 08:26:12 +0000 (08:26 +0000)]
Merge "add xml for virtual machine"

8 years agoadd xml for virtual machine 79/25279/3
Yao Lu [Wed, 30 Nov 2016 11:06:14 +0000 (19:06 +0800)]
add xml for virtual machine

Change-Id: Ib8e0626519d25faff8bffd8f37ba37d5c4eb5015
Signed-off-by: Yao Lu <lu.yao135@zte.com.cn>