summaryrefslogtreecommitdiffstats
path: root/deploy
AgeCommit message (Collapse)AuthorFilesLines
2017-08-09Merge "Use PDF(POD descriptor file) and correct the mapping of nodes and roles"Zhijiang Hu1-5/+43
2017-08-08Fix bug in baremetal deploy with python scriptAlex Yang1-1/+2
Change-Id: I782c4d732ee8774526b21abd3e8636e65916ce3b Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-05Revert "Optimize list express to list generator"Zhijiang Hu1-2/+3
This reverts commit e5a787046aff97a9925a35874d2b6535a9a41c0c. Trying to solve [1] Deploy failed!!!.Traceback (most recent call last): File "/home/daisy/deploy/tempest.py", line 94, in prepare_install host_interface_map, vip, isbare) File "/home/daisy/deploy/tempest.py", line 216, in add_hosts_interface add_host_role(cluster_id, host['id'], host_name, host['name'], vip) File "/home/daisy/deploy/tempest.py", line 225, in add_host_role role.name == "COMPUTER"][0] IndexError: list index out of range [1] https://build.opnfv.org/ci/job/daisy-deploy-daily-master/626/consoleFull Change-Id: I4017b4b38fa350a28d9e9dd5b157caab885a80d0 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-04Merge "Support os-odl-nofeature-* as new scenarios"Alex Yang5-6/+116
2017-08-04Support os-odl-nofeature-* as new scenariosZhijiang Hu5-6/+116
Rename all scenarios with "odl_l3" in their name in Euphrates to just "odl". Daisy will keep "odl_l3" and "odl_l2" (in code, not for user) for further reference. Change-Id: Ib762dd808d4f9467b0e6827b8bbed6d9df7e0e0e Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-04Optimize list express to list generatorzhongjun1-3/+2
optimize list express to list generator in tempest.py Change-Id: I8ba12d33a1fc8b33e29fa0a08d7be40a1361bb65 Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-08-03Use PDF(POD descriptor file) and correct the mapping of nodes and rolesAlex Yang1-5/+43
JIRA: DAISY-42 JIRA: DAISY-56 In bare metal deployment, we can use PDF to get MAC addresses of nodes https://gerrit.opnfv.org/gerrit/#/c/38387/. Then we can use the MACs to help to distinguish the discovered nodes and assign roles to them, like virtual deployment in the link https://gerrit.opnfv.org/gerrit/#/c/38381/. Change-Id: Ib0f1a60b8935f528a828f716ccc916b767cfa6f9 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-01Remove useless parameters and rename some parameters in get_conf.pyAlex Yang1-14/+14
Change-Id: I47949f44ea609932059374b128018e36590e88fd Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-07-31Correct the mapping of nodes and roles in virtual deployAlex Yang5-15/+42
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-31use only one file get_conf.py to get configuration data from deploy.ymlzhouya2-57/+46
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-28Do not provide ipmi user and password in virtual deploymentAlex Yang1-5/+7
Change-Id: Ib7989bed237a03cdab01fea89aba4e2038815e5f Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-07-26Convert the bash commands in post.sh to python codeAlex Yang4-5/+84
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-25Merge "Sync some patches of bash script to python"Zhijiang Hu2-4/+28
2017-07-24when deploy have failed print the api logroot2-0/+6
Change-Id: I6047340f7f0d2c7b6b175335bdbf836a2a8d0a9c Signed-off-by: root <zhou.ya@zte.com.cn>
2017-07-20Sync some patches of bash script to pythonAlex Yang2-4/+28
Change-Id: Ia1eb59e62b1bb98b1871ec591e2c925c1734cc2e Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-07-18md5sum check for cirros imageZhijiang Hu2-13/+35
Change-Id: I874c40eb5da54c38ce8aa2d1fb1840a8aee22b4c Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-07-13add sdn_controller_ip to admin_openrc.shroot1-1/+13
Change-Id: I3af46368109bc5358fd0cc61a43f5be60479eab3 Signed-off-by: root <zhou.ya@zte.com.cn>
2017-07-07Enable HA scenarioszhongjun1-1/+4
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-07add extra interface to enable the keepablived plane and the api planeroot8-175/+207
Change-Id: I0157bf8b6fa9be254c61bb384065f80107ab3dda Signed-off-by: root <zhou.ya@zte.com.cn>
2017-06-30Merge "Initial merge of BM Installation guide"Zhijiang Hu1-6/+0
2017-06-29Initial merge of BM Installation guideZhijiang Hu1-6/+0
Change-Id: I9964f0d75ae879c6b86d245f2007841236a0b931 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-06-29Add an missing parameter and fix a typo in daisy_server.pyAlex Yang1-3/+4
Change-Id: I339508f1c07a9bbefa389c6f6eb5e53640a79417 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-06-27Merge "Adapt the scenario arg add in tempset.py"Alex Yang3-26/+56
2017-06-27Adapt the scenario arg add in tempset.pyzhongjun3-26/+56
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-24enable opendaylightzhouya1-0/+30
Change-Id: I759d864efa524c0d564b9d93aa480e155149adaa Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-06-23Merge "add the scenarios option"Zhijiang Hu9-5/+371
2017-06-23add the scenarios optionzhongjun9-5/+371
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-08solve "no disks in host-detail" errorzhouya1-0/+1
Change-Id: Ifb408a3b3dfa139bb938cc7ef8c9b0981e4266c3 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-06-08Merge "add deployment guidance in vm deployment doc"Zhijiang Hu1-8/+8
2017-06-08add deployment guidance in vm deployment doczhouya1-8/+8
Change-Id: Ia9b370b314b5e897087ae82463af90c4b61018d5 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-06-02Set compute to qemu only in virtual deploymentZhijiang Hu2-5/+16
Change-Id: I0660c016e18491395c7253e5576f8fa1c8aa051e Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-05-31add the missing openrc tokenzhouya1-0/+1
Change-Id: Id9fca539f2f5a866376b12a11306a9ea97760a0d Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-05-29bugfix: delete extra firewalls in virtual deploymentSerenaFeng2-1/+3
Change-Id: I179b5aab51958c0cd4653e65bbd74df5cfd7c53e Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-05-27Merge "Call python script directly in preparation & post-phase"Zhijiang Hu1-4/+6
2017-05-27Merge "Add network name and update gateway of ext-net of baremetal env"Zhijiang Hu1-1/+3
2017-05-27Merge "create data disk for each node in virtual deploy"Alex Yang1-1/+2
2017-05-27create data disk for each node in virtual deployAlex Yang1-1/+2
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-27Call python script directly in preparation & post-phaseAlex Yang1-4/+6
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-27Add network name and update gateway of ext-net of baremetal envAlex Yang1-1/+3
The configurations in securedlab has already been updated. Change-Id: I663c3c8a9bac7fe8ef1a5d16018f9c848ca5427c Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-05-27Increase the timeout to avoid possible deployment failureAlex Yang1-1/+1
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-25Merge "Use unified vm template files in python deploy script"Zhijiang Hu4-3/+32
2017-05-25Use unified vm template files in python deploy scriptAlex Yang4-3/+32
Change-Id: I386011a35a9be3e4f1d468744a6945360bb2adb3 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-05-19Code optimization for list traversalzhongjun1-8/+4
1.replace the list to generator to simply the code. Change-Id: Ia67cf265f3ca004eab5abb8b1d742f53b7d554ad Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-05-15add separated disk for ceph in multi-nodes virtual deployAlex Yang4-15/+41
Change-Id: Ic3f67bb889c20e95916a1052f0cfa1e238f133a8 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-05-15Merge "refacort deploy.yml and add jsonschema to validate it"Zhijiang Hu6-20/+102
2017-05-10refacort deploy.yml and add jsonschema to validate itAlex Yang6-20/+102
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-08Compatible with the no mapping in network.ymlzhongjun1-2/+3
1)resolve the error ' AttributeError: 'NetworkConfig' object has no attribute 'ext_mapping'' with the no mapping in network.yml. 2)resolve the creating external subnet failure if the external netwok exists. Change-Id: I578365d91b8b61f9f88a5d4ff2c9db9ecc512edc Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-05-05Merge "Hardcoded physnet1 changed to obtain from .yml"Zhijiang Hu3-3/+6
2017-05-05Merge "Implement the deployment script with python"Zhijiang Hu5-0/+1087
2017-05-03Hardcoded physnet1 changed to obtain from .ymlzhongjun3-3/+6
the physical network device of external network is hardcode to 'physnet1',change it to obtain from network.yml configuration file. Change-Id: Id2e45ac488619db2247e73cc3fed5706db31d9e9 Signed-off-by: zhongjun <zhong.jun@zte.com.cn>