summaryrefslogtreecommitdiffstats
path: root/ci
AgeCommit message (Collapse)AuthorFilesLines
2017-04-10code variable name refactorzhongjun1-19/+21
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>
2017-03-26Fix bug in virtual deployAlex Yang1-1/+1
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>
2017-03-23Merge "abolish tag to use branch to get daisy from upstream"Zhijiang Hu1-2/+1
2017-03-23Merge "bugfix hardcoded network configuration"Zhijiang Hu1-1/+3
2017-03-22abolish tag to use branch to get daisy from upstreamzhouya1-2/+1
Change-Id: I3bcc1e6d9cbcb2974fc9246a3b1559f9b988d530 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-03-21bugfix hardcoded network configurationSerenaFeng1-1/+3
Change-Id: I1fb6036a2805ccb9bdbe23622514ccd9d997c1a5 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-03-17distinguish virtual and bm deployzhouya1-2/+4
Change-Id: I9fcc4f08283c832d32c22c2195401dd86ecf9dc5 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-03-16unify the definition of NETWORK and NETWORK_CONFSerenaFeng1-9/+2
Change-Id: I1669c92f24739812a4e2d47655b1fc0a1daa3171 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-03-15Merge "add default_floating_pool configuration for nova-api"Zhijiang Hu1-0/+2
2017-03-15add default_floating_pool configuration for nova-apiSerenaFeng1-0/+2
Change-Id: I9db5509667e9c10a9c07b55531c6d78fb95cc223 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-03-14modify daisy install interface and modify check_openstack_progress ↵zhouya1-1/+1
targetnode nums Change-Id: I19f8c18f8b977619c9bbf6f1e80f7c48f8f5db9e Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-03-10add known_hosts file in daisy vmzhouya1-0/+4
Change-Id: Icc58c1ad41264557ad462174188f518fbb1f5ef6 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-03-09Merge "add patch from upstream to fit bm deploy"Zhijiang Hu1-0/+1
2017-03-08add patch from upstream to fit bm deployzhouya1-0/+1
Change-Id: Iefba02c658f7feb45868822334deada245b1d7aa Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-03-08fix libvirt bug of https://bugzilla.redhat.com/show_bug.cgi?id=1404627zhouya1-3/+5
Change-Id: Ia018529ed3ca89e883a8ba2b1a693e2a5250af21 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-03-07Fix judging condition flawJulien-zte1-2/+2
*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>
2017-03-07Merge "fix some bug of bm deploy"Zhijiang Hu1-6/+6
2017-03-07Merge "add framework of post deploy process"Zhijiang Hu2-0/+6
2017-03-06fix some bug of bm deployzhouya1-6/+6
Change-Id: I96bed7259666d48a1fbc41bb9452d8493c4417b8 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-03-06add framework of post deploy processSerenaFeng2-0/+6
Change-Id: I3f5a067a6359be482a853b164fd7effdfad8fc8f Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-03-03Merge "End deployment when timeout"Zhijiang Hu1-1/+7
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 Yang1-1/+7
Change-Id: Iaae02bfc69450d6138b7b187ec23e4ed2eef6138 Signed-off-by: Alex Yang <yangyang1@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-23Merge "Baremetal Deployment on zte-pod2 JIRA: DAISY-30"Zhijiang Hu1-25/+54
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 Ya1-25/+54
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 Yang1-3/+3
Change-Id: If85c06459cda8392827920928b7d65f7e70fc82b Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-02-14Refactor for get_para_from_deployJulien1-31/+24
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-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-06Add parameters support for deployJulien1-9/+101
JIRA: DAISY-29 Change-Id: I53a08f2fa458028a59597d1b7a0c7b9137e40dd7 Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
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-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-07Merge "Run docker from dockerhub"Zhijiang Hu1-31/+5
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 Ya1-8/+33
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-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-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>
2016-12-30solve no file of known_hosts bugzhouya1-1/+1
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>