summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-03-03Merge "fix some typos in .rst files"Zhijiang Hu2-6/+6
2017-03-03Merge "End deployment when timeout"Zhijiang Hu3-2/+26
2017-03-02Fix an error in docker volume removeAlex Yang1-1/+1
Replace $containers_to_kill with $volumes_to_remove in docker volumes removing. Change-Id: I715ff135099be0a8c9424ab3f94509ee72558415 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-03-02End deployment when timeoutAlex Yang3-2/+26
Change-Id: Iaae02bfc69450d6138b7b187ec23e4ed2eef6138 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-03-02fix some typos in .rst fileszhongjun2-6/+6
*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>
2017-02-28Fix daisycloud-core to a specific tagZhijiang1-0/+9
Change-Id: Ife00fdc3409711f8d2de54f03a2a48f778761f80 Signed-off-by: Zhijiang <hu.zhijiang@zte.com.cn>
2017-02-25Make opnfv.bin executableAlex Yang1-2/+5
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>
2017-02-24Merge "spelling check:artifacts repository->artifact repository"Zhijiang Hu1-1/+1
2017-02-24Correct the type error of env CLI Option in tempest.pyAlex Yang1-2/+2
Change-Id: Id7a4f567c7c81e17c33b5c3ba558fa1cc891b42d Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-02-23spelling check:artifacts repository->artifact repositoryzhongjun1-1/+1
Change-Id: I69d5d07e61e3b8aef0a8ecbecfe6828e2361ba66 Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-02-23Merge "Baremetal Deployment on zte-pod2 JIRA: DAISY-30"Zhijiang Hu10-120/+432
2017-02-22Merge "Add executable attribute to opnfv bin file"Zhijiang Hu2-0/+6
2017-02-22Add executable attribute to opnfv bin fileAlex Yang2-0/+6
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>
2017-02-22Baremetal Deployment on zte-pod2Zhou Ya10-120/+432
JIRA: DAISY-30 Change-Id: Ie34180b9d036797d310f612caa189b0a06efb732 Signed-off-by: Zhou Ya <zhou.ya@zte.com.cn>
2017-02-22missing a $ bere varJulien1-1/+1
Change-Id: Ida548591f4e793bc28f4a8df31c07356cee9a82a Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
2017-02-17Add missing bracketsAlex Yang1-1/+1
Change-Id: Ia1f437cad2c4d42e72d4b53cdd6a4f7f00a29edf Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-02-16Fix some typo mistakesAlex Yang3-19/+18
Change-Id: If85c06459cda8392827920928b7d65f7e70fc82b Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-02-14Refactor for get_para_from_deployJulien2-37/+28
Change-Id: I6d8fb4df38bf0749222a2b967a76222c273a7549 Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
2017-02-14refactor for ssh callJulien1-20/+16
Be easy to understand Change-Id: I385569342b96d21f8a9ac6bfb68c92ba424f03ae Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
2017-02-14Merge "Use securedlab for configuration"Zhijiang Hu1-16/+74
2017-02-12Use securedlab for configurationJulien1-16/+74
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>
2017-02-10Merge "Add parameters support for deploy"Zhijiang Hu1-9/+101
2017-02-08Merge "Add basic installation guide docs"Zhijiang Hu6-26/+333
2017-02-07Resolve build silent failureZhijiang Hu1-1/+24
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>
2017-02-07Add basic installation guide docsZhijiang6-26/+333
Change-Id: I9ecb49ceee687b6488f8635544e46e854989d6a5 Signed-off-by: Zhijiang <hu.zhijiang@zte.com.cn>
2017-02-07Merge "Add a judgment in trustme.sh"Zhijiang Hu1-1/+5
2017-02-06Add a judgment in trustme.shzhuzeyu1-1/+5
To check whether the script runs successful Change-Id: I0ae4e01d845690cb6c19f95f0950cd98ebd1338c Signed-off-by: zhuzeyu <zhu.zeyu@zte.com.cn>
2017-02-06Add parameters support for deployJulien1-9/+101
JIRA: DAISY-29 Change-Id: I53a08f2fa458028a59597d1b7a0c7b9137e40dd7 Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
2017-01-19Merge "add centos to /var/lib/daisy/kolla"Zhijiang Hu1-1/+1
2017-01-19remove centos7.qcow2Yao Lu1-2/+3
every time before deploy,we need new centos7.qcow2. Change-Id: I295ed192674a31290b25042c0843875b93831ebc Signed-off-by: Yao Lu <lu.yao135@zte.com.cn>
2017-01-19add centos to /var/lib/daisy/kollaYao Lu1-1/+1
Change-Id: Ifc160b5ae884c2ea7be481b31457752b0be44a71 Signed-off-by: Yao Lu <lu.yao135@zte.com.cn>
2017-01-12Use different variables for local workspace and remote workspaceAlex Yang1-11/+18
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>
2017-01-08Simplify the steps in trustme.shAlex Yang1-43/+8
Change-Id: Ic7432bd78225ba4d598eef0f283957a34e6401de Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-01-07Merge "Run docker from dockerhub"Zhijiang Hu1-31/+5
2017-01-07Merge "clean up env before deploy"Zhijiang Hu3-12/+37
2017-01-05Run docker from dockerhubJulien1-31/+5
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>
2017-01-04clean up env before deployZhou Ya3-12/+37
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>
2017-01-04Add ARG in DockerfileJulien1-1/+2
build-arg requires a ARG define in Dockerfile. Change-Id: Id895449f1d9d73ab70bd9958b8cc8cf2d92c5a3c Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
2017-01-03Merge "fix "No space" error in docker building"Zhijiang Hu1-6/+9
2017-01-03Merge "Add git branch & tag info to version file"Zhijiang Hu1-2/+11
2017-01-03Merge "Fix bug in removing docker containers and images"Zhijiang Hu1-3/+2
2017-01-03Merge "fix interface get type in get_conf"Zhijiang Hu1-2/+3
2017-01-03Merge "set MANAGEMENT ip as null"Zhijiang Hu1-6/+0
2017-01-03Fix bug in removing docker containers and imagesAlex Yang1-3/+2
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>
2017-01-03fix interface get type in get_confZhou Ya1-2/+3
to kill '[0]' in get_conf.py file Change-Id: I82282ff8431bf3eb93746e505e18547929f20ed9 Signed-off-by: Zhou Ya <zhou.ya@zte.com.cn>
2017-01-03set MANAGEMENT ip as nullzhouya1-6/+0
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>
2017-01-03modify the fixed para to a more flexible wayZhou Ya1-4/+20
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>
2016-12-31Merge "solve no file of known_hosts bug"Zhijiang Hu2-5/+14
2016-12-30solve no file of known_hosts bugzhouya2-5/+14
Change-Id: If70e8765709d49a22a4f6c17ab4e2c4589fbf05a Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2016-12-29fix "No space" error in docker buildingAlex Yang1-6/+9
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>