summaryrefslogtreecommitdiffstats
path: root/docs/submodules/daisy
AgeCommit message (Collapse)AuthorFilesLines
2017-08-01Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Remove useless parameters and rename some parameters in get_conf.py" - Remove useless parameters and rename some parameters in get_conf.py Change-Id: I47949f44ea609932059374b128018e36590e88fd Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-01Update git submodulesAlex Yang1-0/+0
* Update docs/submodules/daisy from branch 'master' - Fix typo in patch 38381 JIRA: DAISY-56 controller01 -> $name Change-Id: Icd959ca55079a6ac0bfbd181ff134d7decfb89f5 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-01Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Jira: DAISY-36 Update doc structure This PS update doc structure according to [1]. Note: This PS also add content to doc for describing the mapping methods for map role to discovered nodes. [1] http://docs.opnfv.org/en/stable-danube/how-to-use-docs/documentation-guide.html?highlight=templates#document-structure-and-contribution Change-Id: I7b2ef916753cddd8cd845abae8c7d5865c49e1ac Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-07-31Update git submodulesAlex Yang1-0/+0
* Update docs/submodules/daisy from branch 'master' - 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>
2017-07-31Update git submoduleszhouya1-0/+0
* Update docs/submodules/daisy from branch 'master' - 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>
2017-07-28Update git submodulesAlex Yang1-0/+0
* Update docs/submodules/daisy from branch 'master' - Do not provide ipmi user and password in virtual deployment Change-Id: Ib7989bed237a03cdab01fea89aba4e2038815e5f Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-07-28Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Solve double container removal problem" - 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>
2017-07-27Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Convert the bash commands in post.sh to python code" - 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>
2017-07-26Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - 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>
2017-07-25Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Sync some patches of bash script to python" - Sync some patches of bash script to python Change-Id: Ia1eb59e62b1bb98b1871ec591e2c925c1734cc2e Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-07-25Update git submodulesroot1-0/+0
* Update docs/submodules/daisy from branch 'master' - when deploy have failed print the api log Change-Id: I6047340f7f0d2c7b6b175335bdbf836a2a8d0a9c Signed-off-by: root <zhou.ya@zte.com.cn>
2017-07-21Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - md5sum check for cirros image Change-Id: I874c40eb5da54c38ce8aa2d1fb1840a8aee22b4c Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-07-13Update git submodulesroot1-0/+0
* Update docs/submodules/daisy from branch 'master' - add sdn_controller_ip to admin_openrc.sh Change-Id: I3af46368109bc5358fd0cc61a43f5be60479eab3 Signed-off-by: root <zhou.ya@zte.com.cn>
2017-07-07Update git submoduleszhongjun1-0/+0
* Update docs/submodules/daisy from branch 'master' - 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>
2017-07-07Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "add heartbeat interface introduction in docs" - add heartbeat interface introduction in docs Change-Id: Iaf206f9ea5962410c859ad6f84b03ef1a1aa7771 Signed-off-by: root <zhou.ya@zte.com.cn>
2017-07-07Update git submodulesroot1-0/+0
* Update docs/submodules/daisy from branch 'master' - add extra interface to enable the keepablived plane and the api plane Change-Id: I0157bf8b6fa9be254c61bb384065f80107ab3dda Signed-off-by: root <zhou.ya@zte.com.cn>
2017-07-04Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - 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>
2017-06-30Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Initial merge of BM Installation guide" - Initial merge of BM Installation guide Change-Id: I9964f0d75ae879c6b86d245f2007841236a0b931 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-06-30Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Jira: DAISY-36 Initial merge of release-note" - 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>
2017-06-29Update git submodulesAlex Yang1-0/+0
* Update docs/submodules/daisy from branch 'master' - Add an missing parameter and fix a typo in daisy_server.py Change-Id: I339508f1c07a9bbefa389c6f6eb5e53640a79417 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-06-28Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Add scenario arg check" - 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>
2017-06-28Update git submodulesAlex Yang1-0/+0
* Update docs/submodules/daisy from branch 'master' - 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>
2017-06-27Update git submodulesAlex Yang1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Adapt the scenario arg add in tempset.py" - 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>
2017-06-27Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Update VM intallation network setup for ODL scenario Change-Id: Ie26ca7d81b8d293fbcdc73d5bfa6f2bdbe21e215 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-06-26Update git submodulesAlex Yang1-0/+0
* Update docs/submodules/daisy from branch 'master' - 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>
2017-06-26Update git submoduleszhouya1-0/+0
* Update docs/submodules/daisy from branch 'master' - enable opendaylight Change-Id: I759d864efa524c0d564b9d93aa480e155149adaa Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-06-23Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "add the scenarios option" - 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>
2017-06-09Update git submoduleszhouya1-0/+0
* Update docs/submodules/daisy from branch 'master' - solve "no disks in host-detail" error Change-Id: Ifb408a3b3dfa139bb938cc7ef8c9b0981e4266c3 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-06-08Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "add deployment guidance in vm deployment doc" - add deployment guidance in vm deployment doc Change-Id: Ia9b370b314b5e897087ae82463af90c4b61018d5 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-06-08Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Set compute to qemu only in virtual deployment" - Set compute to qemu only in virtual deployment Change-Id: I0660c016e18491395c7253e5576f8fa1c8aa051e Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-06-03Update git submodulesAlex Yang1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Support scenario parameter" - Support scenario parameter Default is os-nosdn-nofeature-noha Change-Id: I12e70552c426884269c2c7f1bfa05e1db5658bea Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-06-01Update git submodulesAlex Yang1-0/+0
* Update docs/submodules/daisy from branch 'master' - 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>
2017-05-31Update git submoduleszhouya1-0/+0
* Update docs/submodules/daisy from branch 'master' - add the missing openrc token Change-Id: Id9fca539f2f5a866376b12a11306a9ea97760a0d Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-05-30Update git submoduleszhouya1-0/+0
* Update docs/submodules/daisy from branch 'master' - modify deploy script to deploy 1 lb and 4computer Change-Id: I654a27042ff9807a502773d48df1c26d12302de7 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-05-29Update git submodulesSerenaFeng1-0/+0
* Update docs/submodules/daisy from branch 'master' - bugfix: delete extra firewalls in virtual deployment Change-Id: I179b5aab51958c0cd4653e65bbd74df5cfd7c53e Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-05-27Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Call python script directly in preparation & post-phase" - 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>
2017-05-27Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Add network name and update gateway of ext-net of baremetal env" - 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>
2017-05-27Update git submodulesAlex Yang1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Create ceph disk in bash script" - Create ceph disk in bash script Change-Id: Ib80710c784d384ebc27eb0f51fcb4384017eecca Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-05-27Update git submodulesAlex Yang1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "create data disk for each node in virtual deploy" - 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>
2017-05-27Update git submodulesAlex Yang1-0/+0
* Update docs/submodules/daisy from branch 'master' - 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>
2017-05-26Update git submodulesSerenaFeng1-0/+0
* Update docs/submodules/daisy from branch 'master' - add prepare and post process for baremental deployment Change-Id: I3026c4dd83cc19246c19ab568005c4c0b37ff9d9 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-05-25Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Use unified vm template files in python deploy script" - Use unified vm template files in python deploy script Change-Id: I386011a35a9be3e4f1d468744a6945360bb2adb3 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-05-25Update git submodulesAlex Yang1-0/+0
* Update docs/submodules/daisy from branch 'master' - 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>
2017-05-25Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Code optimization for list traversal" - 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>
2017-05-25Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "enlarge the ram of all_in_one node" - 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>
2017-05-25Update git submodulesAlex Yang1-0/+0
* Update docs/submodules/daisy from branch 'master' - Add dependencies for ocata version into docker file Change-Id: I3dc81449293a00b5b095ecea8a48a0cdb03cd4e8 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-05-25Update git submodulesAlex Yang1-0/+0
* Update docs/submodules/daisy from branch 'master' - 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>
2017-05-17Update git submodulesAlex Yang1-0/+0
* Update docs/submodules/daisy from branch 'master' - add separated disk for ceph in multi-nodes virtual deploy Change-Id: Ic3f67bb889c20e95916a1052f0cfa1e238f133a8 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-05-15Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "refacort deploy.yml and add jsonschema to validate it" - 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>
2017-05-15Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - 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>