summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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-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>
2016-12-26Add git branch & tag info to version fileZhijiang1-2/+11
Change-Id: I860bcb9d08a9590ed7902e33a925ec1412e67408 Signed-off-by: Zhijiang <hu.zhijiang@zte.com.cn>
2016-12-23Update the url to download centos isoAlex Yang1-3/+5
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>
2016-12-22Merge "Fix build-args error in dockerfile"Zhijiang Hu1-0/+1
2016-12-20Merge "implement deploy on virthal pod"Zhijiang Hu12-162/+455
2016-12-20Merge "Use new Kolla image package format"Zhijiang Hu2-8/+17
2016-12-20implement deploy on virthal podYao Lu12-162/+455
Change-Id: I600e21f0d36f37c75cac4ace5f7225e32ab93d56 Signed-off-by: Yao Lu <lu.yao135@zte.com.cn>
2016-12-20Use new Kolla image package formatYao Lu2-8/+17
Change-Id: I542630e0eb26e6a0630683186a645642411009e1 Signed-off-by: Yao Lu <lu.yao135@zte.com.cn>
2016-12-20Merge "fix interface definition in yml"Zhijiang Hu2-14/+19
2016-12-19Merge "Container image build script"Zhijiang Hu1-0/+202
2016-12-18Container image build scriptZhijiang1-0/+202
JIRA: DAISY-17 Change-Id: I91a2e27be3eec1e6edc1b5ed2c9b2b91f15f7705 Signed-off-by: Zhijiang <hu.zhijiang@zte.com.cn>
2016-12-18fix interface definition in ymlJulien2-14/+19
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>
2016-12-17Fix build-args error in dockerfileJulien1-0/+1
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>
2016-12-12Move Dockerfile to ./docker pathJulien2-1/+1
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>
2016-12-12Miss call cleanup_docker_imageJulien1-2/+1
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>
2016-12-12Merge "download and modify centos image"Zhijiang Hu2-0/+307
2016-12-12Merge "refactor get_conf"Zhijiang Hu1-57/+23
2016-12-10Merge "bash format"Zhijiang Hu1-39/+36
2016-12-09download and modify centos imageAlex Yang2-0/+307
Change-Id: I1934fb75d5d7f4a50f44c06080fbcec4f6c81f02 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2016-12-08refactor get_confJulien1-57/+23
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>
2016-12-08Merge "fix yml define and wrong implementation"Zhijiang Hu3-45/+45
2016-12-08Merge "modify spelling mistake"Zhijiang Hu1-1/+1
2016-12-08Merge "add xml for virtual machine"Zhijiang Hu4-0/+271
2016-12-08add xml for virtual machineYao Lu4-0/+271
Change-Id: Ib8e0626519d25faff8bffd8f37ba37d5c4eb5015 Signed-off-by: Yao Lu <lu.yao135@zte.com.cn>