summary |
shortlog | log |
commit |
commitdiff |
review |
tree
first ⋅ prev ⋅ next
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>
Zhijiang Hu [Tue, 7 Feb 2017 01:38:51 +0000 (01:38 +0000)]
Merge "Add a judgment in trustme.sh"
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>
Zhijiang Hu [Thu, 19 Jan 2017 09:24:43 +0000 (09:24 +0000)]
Merge "add centos to /var/lib/daisy/kolla"
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>
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>
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>
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>
Zhijiang Hu [Sat, 7 Jan 2017 01:04:10 +0000 (01:04 +0000)]
Merge "Run docker from dockerhub"
Zhijiang Hu [Sat, 7 Jan 2017 01:02:23 +0000 (01:02 +0000)]
Merge "clean up env before deploy"
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>
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>
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>
Zhijiang Hu [Tue, 3 Jan 2017 08:03:41 +0000 (08:03 +0000)]
Merge "fix "No space" error in docker building"
Zhijiang Hu [Tue, 3 Jan 2017 08:02:14 +0000 (08:02 +0000)]
Merge "Add git branch & tag info to version file"
Zhijiang Hu [Tue, 3 Jan 2017 08:01:59 +0000 (08:01 +0000)]
Merge "Fix bug in removing docker containers and images"
Zhijiang Hu [Tue, 3 Jan 2017 07:57:27 +0000 (07:57 +0000)]
Merge "fix interface get type in get_conf"
Zhijiang Hu [Tue, 3 Jan 2017 07:57:15 +0000 (07:57 +0000)]
Merge "set MANAGEMENT ip as null"
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>
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>
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>
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>
Zhijiang Hu [Sat, 31 Dec 2016 00:32:15 +0000 (00:32 +0000)]
Merge "solve no file of known_hosts bug"
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>
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>
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>
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>
Zhijiang Hu [Thu, 22 Dec 2016 09:02:46 +0000 (09:02 +0000)]
Merge "Fix build-args error in dockerfile"
Zhijiang Hu [Tue, 20 Dec 2016 07:29:16 +0000 (07:29 +0000)]
Merge "implement deploy on virthal pod"
Zhijiang Hu [Tue, 20 Dec 2016 07:28:41 +0000 (07:28 +0000)]
Merge "Use new Kolla image package format"
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>
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>
Zhijiang Hu [Tue, 20 Dec 2016 06:17:59 +0000 (06:17 +0000)]
Merge "fix interface definition in yml"
Zhijiang Hu [Mon, 19 Dec 2016 06:22:14 +0000 (06:22 +0000)]
Merge "Container image build script"
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>
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>
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>
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>
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>
Zhijiang Hu [Mon, 12 Dec 2016 01:35:54 +0000 (01:35 +0000)]
Merge "download and modify centos image"
Zhijiang Hu [Mon, 12 Dec 2016 01:07:39 +0000 (01:07 +0000)]
Merge "refactor get_conf"
Zhijiang Hu [Sat, 10 Dec 2016 03:48:25 +0000 (03:48 +0000)]
Merge "bash format"
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>
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>
Zhijiang Hu [Thu, 8 Dec 2016 09:15:16 +0000 (09:15 +0000)]
Merge "fix yml define and wrong implementation"
Zhijiang Hu [Thu, 8 Dec 2016 09:04:51 +0000 (09:04 +0000)]
Merge "modify spelling mistake"
Zhijiang Hu [Thu, 8 Dec 2016 08:26:12 +0000 (08:26 +0000)]
Merge "add xml for virtual machine"
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>
Julien [Thu, 8 Dec 2016 02:50:42 +0000 (10:50 +0800)]
fix yml define and wrong implementation
1. use list to define interfaces
2. no necessary to fetch [0]
Change-Id: If17605b27c00d4e7fca8bced9c0bb4f7c724a4f2
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
Julien [Wed, 7 Dec 2016 07:48:22 +0000 (15:48 +0800)]
bash format
1. use 4 header spaces instead of 8
2. keep max line width less than 80
3. don't mix use header tab and header space according pep8
4. for we use -x debug switch, no necessary to echo debug info
Change-Id: I1cb4adf0fcfdad3bc015213ae4ad9b822748dd82
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
zhouya [Wed, 7 Dec 2016 03:56:40 +0000 (11:56 +0800)]
modify spelling mistake
Change-Id: Idbcf956afb4be1b7128999c74c90ec6ed16ac33a
Signed-off-by: zhouya <zhou.ya@zte.com.cn>
Zhijiang Hu [Wed, 7 Dec 2016 02:12:39 +0000 (02:12 +0000)]
Merge "Add .gitignore file for easier usage"
Julien [Wed, 7 Dec 2016 01:04:36 +0000 (09:04 +0800)]
Add .gitignore file for easier usage
Change-Id: I284a4f87ddb1ab35f2d3cb67d0132c7792bfbbfb
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
zeyu zhu [Mon, 5 Dec 2016 03:02:42 +0000 (11:02 +0800)]
Modify the OpenStack Software Repositories
Change-Id: Iad4bdef7c2b7f02776224b03cb55e5bd42d3cc71
Signed-off-by: zeyu zhu <zhu.zeyu@zte.com.cn>
wu.zhihui [Mon, 21 Nov 2016 01:42:34 +0000 (09:42 +0800)]
Fix a security issue
load yaml file by using function safe_load()
See link http://pyyaml.org/wiki/PyYAMLDocumentation for details.
Change-Id: I91d1746c5ca1bd1770d47d4e8d0f85b6aed47934
Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>
Yao Lu [Thu, 17 Nov 2016 08:02:52 +0000 (16:02 +0800)]
add common config and parse it to prepare deploy
Change-Id: I864082b885a4c7117f0b546da602e9580e8ccf46
Signed-off-by: Yao Lu <lu.yao135@zte.com.cn>
Yao Lu [Thu, 17 Nov 2016 08:41:14 +0000 (16:41 +0800)]
exit deploy.sh before finish test
Change-Id: Ie988eec63ab59997cfecd5cd9b6af3e4976244c3
Signed-off-by: Yao Lu <lu.yao135@zte.com.cn>
Yao Lu [Tue, 15 Nov 2016 07:57:43 +0000 (15:57 +0800)]
add map with local and docker path /home/cache
Change-Id: I7f3ad5c7c7f70a14b7efd6e27c9958b1e396eef0
Signed-off-by: Yao Lu <lu.yao135@zte.com.cn>
Zhijiang Hu [Tue, 15 Nov 2016 01:39:51 +0000 (01:39 +0000)]
Merge "add docs framework"
Jing Sun [Mon, 14 Nov 2016 09:47:27 +0000 (17:47 +0800)]
add docs framework
Change-Id: I6167a188327a2b3bbb56757fa17c7817c4464dfb
Signed-off-by: Jing Sun <sun.jing22@zte.com.cn>
Yao Lu [Mon, 14 Nov 2016 11:32:08 +0000 (19:32 +0800)]
install wget rpm in docker
Change-Id: I89d877e53c36c7ba329cc5d966b1089b59903806
Signed-off-by: Yao Lu <lu.yao135@zte.com.cn>
Yao Lu [Fri, 11 Nov 2016 03:43:10 +0000 (11:43 +0800)]
rename daisy bin with gerrit number
Change-Id: I5314a0ba1a7885c334ea939c91eaa6ece074cb0d
Signed-off-by: Yao Lu <lu.yao135@zte.com.cn>
Yao Lu [Fri, 11 Nov 2016 07:39:35 +0000 (15:39 +0800)]
add deploy script
Change-Id: I1f12690f4f736adbd42222561edd18ca4b7c6925
Signed-off-by: Yao Lu <lu.yao135@zte.com.cn>
Yao Lu [Wed, 9 Nov 2016 10:40:48 +0000 (18:40 +0800)]
modify iso and tar path
Change-Id: I526c814a7895bdf2ed97af5cb51e6140a542c7fd
Signed-off-by: Yao Lu <lu.yao135@zte.com.cn>
Zhijiang [Wed, 9 Nov 2016 04:09:15 +0000 (23:09 -0500)]
Add packages required by build script
Change-Id: Iabb6dbd5a542843d0607f1b5b73991404f3e4eaa
Signed-off-by: Zhijiang <hu.zhijiang@zte.com.cn>
Zhijiang [Wed, 2 Nov 2016 04:05:36 +0000 (00:05 -0400)]
Fix docker builder base image to centos7
Change-Id: I5b4c79aecfd300a325c7a9c06bdaf671f4cf37d5
Signed-off-by: Zhijiang <hu.zhijiang@zte.com.cn>
Yao Lu [Tue, 25 Oct 2016 01:04:16 +0000 (09:04 +0800)]
add patch of openstack/daisycloud
the patch is about integrate kolla tar and tgz and centos to daisy bin
and cp to appoint path
Change-Id: I3043d2a38f15cdff44f9c777bff8bb5e517684bd
Signed-off-by: Yao Lu <lu.yao135@zte.com.cn>
Zhijiang Hu [Tue, 25 Oct 2016 10:10:43 +0000 (06:10 -0400)]
Add doc for how to support vlan tenant network type
Change-Id: I7f17b159a7584a133c8b3cca3a8d9bd5902830a7
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
Zhijiang [Fri, 21 Oct 2016 05:21:30 +0000 (01:21 -0400)]
Automatically remove the container when it exits
Change-Id: I7ce146ef4dc8717e782600750660dddf45e3047f
Signed-off-by: Zhijiang <hu.zhijiang@zte.com.cn>
Jing Sun [Thu, 13 Oct 2016 14:30:39 +0000 (10:30 -0400)]
add build script for daisy4nfv
Change-Id: I53daa25a87f04b2e0d4988d095a8d99535489dac
Signed-off-by: Jing Sun <sun.jing22@zte.com.cn>
Aric Gardner [Mon, 11 Jul 2016 20:02:29 +0000 (16:02 -0400)]
Adding INFO and LICENSE for review
Change-Id: I8f51581b6d7a5cde77a02d6d0cc32a7d9d0cae8a
Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
Aric Gardner [Mon, 11 Jul 2016 20:02:23 +0000 (20:02 +0000)]
Initial empty repository
Code Review / daisy.git / log