daisy.git
7 years agoCorrect the mapping of nodes and roles in virtual deploy 81/38381/5
Alex Yang [Sat, 29 Jul 2017 12:29:52 +0000 (20:29 +0800)]
Correct the mapping of nodes and roles in virtual deploy

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>
7 years agouse only one file get_conf.py to get configuration data from deploy.yml 05/38405/2
zhouya [Mon, 31 Jul 2017 05:21:59 +0000 (13:21 +0800)]
use only one file get_conf.py to get configuration data from deploy.yml

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>
7 years agoDo not provide ipmi user and password in virtual deployment 21/38321/1
Alex Yang [Fri, 28 Jul 2017 07:45:45 +0000 (15:45 +0800)]
Do not provide ipmi user and password in virtual deployment

Change-Id: Ib7989bed237a03cdab01fea89aba4e2038815e5f
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
7 years agoMerge "Solve double container removal problem"
Zhijiang Hu [Fri, 28 Jul 2017 01:32:30 +0000 (01:32 +0000)]
Merge "Solve double container removal problem"

7 years agoMerge "Convert the bash commands in post.sh to python code"
Zhijiang Hu [Thu, 27 Jul 2017 00:59:13 +0000 (00:59 +0000)]
Merge "Convert the bash commands in post.sh to python code"

7 years agoSolve double container removal problem 45/38145/1
Zhijiang Hu [Wed, 26 Jul 2017 11:12:01 +0000 (19:12 +0800)]
Solve double container removal problem

From [1], We got an error from docker: "No such container: daisy"
while issuing "docker rm -v -f daisy", this OK because we do
docker run --rm before this. So it is safe to add "|| true" after
"docker rm -v -f daisy".

[1] https://build.opnfv.org/ci/job/daisy-build-daily-master/500/console

Change-Id: I3d17595156f1b6181a84d9a03e2cd6ddff275eb3
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
7 years agoClose upstream merge window 31/38131/1
Zhijiang Hu [Wed, 26 Jul 2017 08:39:23 +0000 (04:39 -0400)]
Close upstream merge window

Switch to upstream daisy's stable/ocata branch

Change-Id: I5ff0b0a28a8d2f76f0cb813af8f8241175bb6054
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
7 years agoConvert the bash commands in post.sh to python code 13/38113/2
Alex Yang [Wed, 26 Jul 2017 03:15:44 +0000 (11:15 +0800)]
Convert the bash commands in post.sh to python code

According to the comment from Serena in the patch
https://gerrit.opnfv.org/gerrit/#/c/37857/, the bash code
in post.sh can be implemented by python, and the deploy
script can call post/execute.py directly.

Change-Id: Ibcf86fc2b6ee3942e4082384c9d4075d608b7294
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
7 years agoMerge "Sync some patches of bash script to python"
Zhijiang Hu [Tue, 25 Jul 2017 02:06:37 +0000 (02:06 +0000)]
Merge "Sync some patches of bash script to python"

7 years agowhen deploy have failed print the api log 85/37985/1
root [Mon, 24 Jul 2017 07:20:29 +0000 (15:20 +0800)]
when deploy have failed print the api log

Change-Id: I6047340f7f0d2c7b6b175335bdbf836a2a8d0a9c
Signed-off-by: root <zhou.ya@zte.com.cn>
8 years agoSync some patches of bash script to python 57/37857/1
Alex Yang [Thu, 20 Jul 2017 11:41:02 +0000 (19:41 +0800)]
Sync some patches of bash script to python

Change-Id: Ia1eb59e62b1bb98b1871ec591e2c925c1734cc2e
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
8 years agomd5sum check for cirros image 53/37553/5
Zhijiang Hu [Sat, 15 Jul 2017 02:52:40 +0000 (22:52 -0400)]
md5sum check for cirros image

Change-Id: I874c40eb5da54c38ce8aa2d1fb1840a8aee22b4c
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
8 years agoadd sdn_controller_ip to admin_openrc.sh 41/37241/4
root [Wed, 12 Jul 2017 06:44:59 +0000 (14:44 +0800)]
add sdn_controller_ip to admin_openrc.sh

Change-Id: I3af46368109bc5358fd0cc61a43f5be60479eab3
Signed-off-by: root <zhou.ya@zte.com.cn>
8 years agoEnable HA scenarios 43/37043/2
zhongjun [Fri, 7 Jul 2017 01:07:48 +0000 (09:07 +0800)]
Enable HA scenarios

Enable HA scenario options due to support HA function in upsteam.

Change-Id: Ie1889afc1a149f171a9b324eb284fd650baed397
Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
8 years agoMerge "add heartbeat interface introduction in docs"
Zhijiang Hu [Fri, 7 Jul 2017 06:33:44 +0000 (06:33 +0000)]
Merge "add heartbeat interface introduction in docs"

8 years agoadd heartbeat interface introduction in docs 49/37049/1
root [Fri, 7 Jul 2017 04:57:14 +0000 (12:57 +0800)]
add heartbeat interface introduction in docs

Change-Id: Iaf206f9ea5962410c859ad6f84b03ef1a1aa7771
Signed-off-by: root <zhou.ya@zte.com.cn>
8 years agoadd extra interface to enable the keepablived plane and the api plane 89/36989/6
root [Thu, 6 Jul 2017 02:42:50 +0000 (10:42 +0800)]
add extra interface to enable the keepablived plane and the api plane

Change-Id: I0157bf8b6fa9be254c61bb384065f80107ab3dda
Signed-off-by: root <zhou.ya@zte.com.cn>
8 years agoos-nosdn-nofeature-ha as a valid scenario 79/36879/1
Zhijiang Hu [Tue, 4 Jul 2017 02:34:39 +0000 (22:34 -0400)]
os-nosdn-nofeature-ha as a valid scenario

Project job deployment job uses os-nosdn-nofeature-ha currently,
so we need to treat os-nosdn-nofeature-ha as a valid scenario
to let the job continue to work.

Change-Id: Ib9311ada9b043b1f695f43edb51adbb3714d3356
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
8 years agoMerge "Initial merge of BM Installation guide"
Zhijiang Hu [Fri, 30 Jun 2017 01:38:19 +0000 (01:38 +0000)]
Merge "Initial merge of BM Installation guide"

8 years agoMerge "Jira: DAISY-36 Initial merge of release-note"
Zhijiang Hu [Fri, 30 Jun 2017 01:38:03 +0000 (01:38 +0000)]
Merge "Jira: DAISY-36 Initial merge of release-note"

8 years agoJira: DAISY-36 Initial merge of release-note 05/36705/2
Zhijiang Hu [Thu, 29 Jun 2017 09:16:23 +0000 (05:16 -0400)]
Jira: DAISY-36 Initial merge of release-note

Also fix some index.rst

Change-Id: I6aae9fbc5821e8a1c65a02c6b8926e42a10c19cb
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
8 years agoInitial merge of BM Installation guide 35/36535/11
Zhijiang Hu [Tue, 27 Jun 2017 04:39:20 +0000 (00:39 -0400)]
Initial merge of BM Installation guide

Change-Id: I9964f0d75ae879c6b86d245f2007841236a0b931
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
8 years agoAdd an missing parameter and fix a typo in daisy_server.py 99/36699/1
Alex Yang [Thu, 29 Jun 2017 07:11:41 +0000 (15:11 +0800)]
Add an missing parameter and fix a typo in daisy_server.py

Change-Id: I339508f1c07a9bbefa389c6f6eb5e53640a79417
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
8 years agoMerge "Add scenario arg check"
Zhijiang Hu [Wed, 28 Jun 2017 09:27:19 +0000 (09:27 +0000)]
Merge "Add scenario arg check"

8 years agoAdd scenario arg check 17/36617/1
zhongjun [Wed, 28 Jun 2017 05:48:29 +0000 (13:48 +0800)]
Add scenario arg check

Add the scenario argument valid check in deploy.sh.

Change-Id: Ifeeed3882b22ba379975c2356d761e0536c5c2c9
Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
8 years agoEnlarge the RAM of the nodes in virtual deployment 11/36611/1
Alex Yang [Wed, 28 Jun 2017 01:41:51 +0000 (09:41 +0800)]
Enlarge the RAM of the nodes in virtual deployment

Now the RAM of controller node in virtual deploymeny is only 4GB.

[root@host-10-20-11-6 ~]# free -h
              total        used        free      shared  buff/cache   available
Mem:           3.7G        3.2G        145M        1.7M        408M        191M
Swap:          4.0G        4.0G        2.3M

Since the RAM on the deploy server is at least 64GB (see installation
guide), we can enlarge every node's RAM to improve the performance.

Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
Change-Id: Ie4e1297697e349a6b3edf0fa0c54eeeb94255ca8
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
8 years agoMerge "Adapt the scenario arg add in tempset.py"
Alex Yang [Tue, 27 Jun 2017 10:02:36 +0000 (10:02 +0000)]
Merge "Adapt the scenario arg add in tempset.py"

8 years agoAdapt the scenario arg add in tempset.py 67/36467/4
zhongjun [Mon, 26 Jun 2017 03:16:15 +0000 (11:16 +0800)]
Adapt the scenario arg add in tempset.py

1.adapt the scenario argument add in tempset.py, detail please
refer to
https://gerrit.opnfv.org/gerrit/#/c/36229/5/deploy/tempest.py.
2.bugfix to update the self.deploy_file with the constructed final
deploy file in deoploy.py.

Change-Id: Ia46720649a2361f0b84749925d2c0dede78ccdb5
Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
8 years agoUpdate VM intallation network setup for ODL scenario 93/36493/1
Zhijiang Hu [Mon, 26 Jun 2017 09:46:09 +0000 (05:46 -0400)]
Update VM intallation network setup for ODL scenario

Change-Id: Ie26ca7d81b8d293fbcdc73d5bfa6f2bdbe21e215
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
8 years agoCorrect the kolla image version in makefile_patch.sh 69/36469/1
Alex Yang [Mon, 26 Jun 2017 03:23:35 +0000 (11:23 +0800)]
Correct the kolla image version in makefile_patch.sh

Makefile_patch.sh is missed in patch 36229.

Change-Id: I8da88a0f8220061b4ad03711c1a52715703dd579
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
8 years agoenable opendaylight 29/36229/5
zhouya [Tue, 20 Jun 2017 09:31:38 +0000 (17:31 +0800)]
enable opendaylight

Change-Id: I759d864efa524c0d564b9d93aa480e155149adaa
Signed-off-by: zhouya <zhou.ya@zte.com.cn>
8 years agoMerge "add the scenarios option"
Zhijiang Hu [Fri, 23 Jun 2017 07:30:38 +0000 (07:30 +0000)]
Merge "add the scenarios option"

8 years agoadd the scenarios option 41/36341/5
zhongjun [Thu, 22 Jun 2017 02:31:14 +0000 (10:31 +0800)]
add the scenarios option

Add the scenarios option and yaml configuration files,
currently only support three scenarios as below.
os-nosdn-nofeature-noha/os-odl_l3-nofeature-noha/
os-odl_l2-nofeature-noha.
we will support more secnarios such as os-odl_l3-nofeature-ha
in future.

Change-Id: I24d7875208e277f6ee1b794c0033d5fee6b5e371
Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
8 years agosolve "no disks in host-detail" error 15/35915/1
zhouya [Thu, 8 Jun 2017 08:31:27 +0000 (16:31 +0800)]
solve "no disks in host-detail" error

Change-Id: Ifb408a3b3dfa139bb938cc7ef8c9b0981e4266c3
Signed-off-by: zhouya <zhou.ya@zte.com.cn>
8 years agoMerge "add deployment guidance in vm deployment doc"
Zhijiang Hu [Thu, 8 Jun 2017 06:39:56 +0000 (06:39 +0000)]
Merge "add deployment guidance in vm deployment doc"

8 years agoadd deployment guidance in vm deployment doc 49/35849/7
zhouya [Wed, 7 Jun 2017 02:40:15 +0000 (10:40 +0800)]
add deployment guidance in vm deployment doc

Change-Id: Ia9b370b314b5e897087ae82463af90c4b61018d5
Signed-off-by: zhouya <zhou.ya@zte.com.cn>
8 years agoMerge "Set compute to qemu only in virtual deployment"
Zhijiang Hu [Thu, 8 Jun 2017 06:32:12 +0000 (06:32 +0000)]
Merge "Set compute to qemu only in virtual deployment"

8 years agoMerge "Support scenario parameter"
Alex Yang [Sat, 3 Jun 2017 09:03:38 +0000 (09:03 +0000)]
Merge "Support scenario parameter"

8 years agoSet compute to qemu only in virtual deployment 47/35747/1
Zhijiang Hu [Fri, 2 Jun 2017 14:45:39 +0000 (22:45 +0800)]
Set compute to qemu only in virtual deployment

Change-Id: I0660c016e18491395c7253e5576f8fa1c8aa051e
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
8 years agoSupport scenario parameter 37/35637/1
Zhijiang Hu [Thu, 1 Jun 2017 10:13:03 +0000 (06:13 -0400)]
Support scenario parameter

Default is os-nosdn-nofeature-noha

Change-Id: I12e70552c426884269c2c7f1bfa05e1db5658bea
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
8 years agoRemove iptables rules only in virtual deployment 79/35579/1
Alex Yang [Wed, 31 May 2017 14:58:44 +0000 (22:58 +0800)]
Remove iptables rules only in virtual deployment

There are error messages "iptables: No chain/target/match by that name"
in baremetal deployment:
https://build.opnfv.org/ci/job/daisy-deploy-daily-master/298/console

Change-Id: I7e2940222fd0a99ee42823a08a285bdd93892fe6
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
8 years agoadd the missing openrc token 59/35559/1
zhouya [Wed, 31 May 2017 00:30:44 +0000 (08:30 +0800)]
add the missing openrc token

Change-Id: Id9fca539f2f5a866376b12a11306a9ea97760a0d
Signed-off-by: zhouya <zhou.ya@zte.com.cn>
8 years agomodify deploy script to deploy 1 lb and 4computer 19/35519/1
zhouya [Tue, 30 May 2017 08:48:12 +0000 (16:48 +0800)]
modify deploy script to deploy 1 lb and 4computer

Change-Id: I654a27042ff9807a502773d48df1c26d12302de7
Signed-off-by: zhouya <zhou.ya@zte.com.cn>
8 years agobugfix: delete extra firewalls in virtual deployment 81/35481/1
SerenaFeng [Mon, 29 May 2017 11:11:42 +0000 (19:11 +0800)]
bugfix: delete extra firewalls in virtual deployment

Change-Id: I179b5aab51958c0cd4653e65bbd74df5cfd7c53e
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
8 years agoMerge "Call python script directly in preparation & post-phase"
Zhijiang Hu [Sat, 27 May 2017 13:27:32 +0000 (13:27 +0000)]
Merge "Call python script directly in preparation & post-phase"

8 years agoMerge "Add network name and update gateway of ext-net of baremetal env"
Zhijiang Hu [Sat, 27 May 2017 09:56:37 +0000 (09:56 +0000)]
Merge "Add network name and update gateway of ext-net of baremetal env"

8 years agoMerge "Create ceph disk in bash script"
Alex Yang [Sat, 27 May 2017 05:51:38 +0000 (05:51 +0000)]
Merge "Create ceph disk in bash script"

8 years agoMerge "create data disk for each node in virtual deploy"
Alex Yang [Sat, 27 May 2017 03:55:08 +0000 (03:55 +0000)]
Merge "create data disk for each node in virtual deploy"

8 years agocreate data disk for each node in virtual deploy 33/35433/1
Alex Yang [Sat, 27 May 2017 03:44:03 +0000 (11:44 +0800)]
create data disk for each node in virtual deploy

Since the roles are assigned randomly now, data disk should be created
for every node.

Change-Id: Idd12191033844dad58676de65df0fbc99a51cfbc
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
8 years agoCall python script directly in preparation & post-phase 39/35439/1
Alex Yang [Sat, 27 May 2017 02:01:19 +0000 (10:01 +0800)]
Call python script directly in preparation & post-phase

Avoid calling python though a bash in the deployment script of python.

Change-Id: I655c7b919ea5970ff842ac03cafed11b82d03601
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
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 agoIncrease the timeout to avoid possible deployment failure 27/35427/1
Alex Yang [Sat, 27 May 2017 01:13:31 +0000 (09:13 +0800)]
Increase the timeout to avoid possible deployment failure

Multi-node virtual deployment takes longer than baremetal or all_in_one
deployment. Increase the timeout to avoid possible failure.

Change-Id: Ib6060ad34563724e9949e152fb41accb7a6528da
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 agoCreate ceph disk in bash script 81/35381/1
Alex Yang [Fri, 26 May 2017 02:13:00 +0000 (10:13 +0800)]
Create ceph disk in bash script

Change-Id: Ib80710c784d384ebc27eb0f51fcb4384017eecca
Signed-off-by: Alex Yang <yangyang1@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>