summaryrefslogtreecommitdiffstats
path: root/deploy
AgeCommit message (Collapse)AuthorFilesLines
2017-09-25Use pxe bridge to replace the bridge in VM templateAlex Yang3-13/+32
1. Eliminate hard code about pxe bridge 2. Replace the bridge in daisy VM template with the pxe bridge provided by jenkins Change-Id: I7a8463181847417d10705ce9ff4db6e68d505c6d Signed-off-by: Alex Yang <yangyang1@zte.com.cn> (cherry picked from commit 56975272e92efa3f5f6f719028dc147c1d90e9ce)
2017-09-12Eliminate hard code about ipmi info in bash scriptAlex Yang1-23/+38
Change-Id: I642d130566137dff727b7227658afe6ace9473d6 Signed-off-by: Alex Yang <yangyang1@zte.com.cn> (cherry picked from commit 94d3957c5aba2db70d06929ac9538280a71c6641)
2017-09-09Export kolla preparation log when install failedAlex Yang1-6/+18
Change-Id: I08844b899de2dba539b3c3942345f83d1ac3c198 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-09-08Merge "Kill zip() in add_hosts_interface()"Zhijiang Hu1-12/+20
2017-09-06Kill zip() in add_hosts_interface()Zhijiang Hu1-12/+20
Since mac_address_map is always avaliable, there is no need to pass host_name into add_hosts_interface() and use zip() to do strange combination any more. This change: 1) Is trying to make code more understandable 2) Also delete a unused parameter for add_host_role() Change-Id: Icef47cdf7f1a1522600b351f6e2f47d6f62efa9f Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-09-06Eliminate hard coding about ipmi infoAlex Yang2-18/+17
1. Eliminate hard coding 2. Add ipmi info in schemas 3. Add unit test Change-Id: I4561bbc9454e02fd1de2106645db341a4129245b Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-09-02Enlarge kolla log output size to 5000 linesZhijiang Hu1-1/+1
Change-Id: I9916d494e67b788d491b44fc1d0202d5ac20e710 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-29Refactor the parameters checkingAlex Yang1-41/+37
Change-Id: I0acd39671ea8b7e574719acb96b8c5df93b66443 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-26revert build_pxe_for_discover function to build pxe serverzhouya2-1/+21
In case of deploy failed with deploy.sh file without reinstall daisy node, we need to resetup DHCP in tempest.py script Change-Id: Ia7b4de7933bf4957226a2bf0965858a555f0ed54 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-08-21delete the HEARTBEAT plane in all_in_one networkzhouya1-8/+0
There is only one node in all-in-one env,so do not need to configure the HEARTBEAT plane, without this ps,we may get the globals.yml file an extra wrong value of keepalived_interface: '{{ network_interface }}' which is unnecessary for all-in-one env, and will result in keepalive not work, VIP lose, and since we still use VIP in all-in-one env, the whole deployment may fail. Change-Id: Ic1efabb533fd63e95254ad19ccf98adb5da6ae78 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-08-18Merge "Add pytest file for prepare/execute.py"Zhijiang Hu1-1/+1
2017-08-18Add pytest file for prepare/execute.pyzhongjun1-1/+1
1.Add pytest file test_execute.py for prepare/execute.py. 2.Change the makedirs mode from 0600 to 0700 for test env. Change-Id: Ie29e9e4b4210b170f448faf4df907e55bff1435f Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-08-18Merge "Modify schemas.py"Zhijiang Hu1-3/+33
2017-08-17Modify schemas.pyAlex Yang1-3/+33
1. add schemas for elements added recently in deploy.yml 2. remove daisy_ip from required list, prepare for generate it auto 3. add main() function to make this file useful in bash Change-Id: Ic7a3a87305f96b064260967862f976e33cdea294 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-17use daisy.conf to build pxe serverzhouya2-11/+3
we use the interface of daisyclient to build the pxe server in tempest.py,but we can use the daisy.conf to build the pxe server instead,this is just the optimization of code Change-Id: I7a75d33aa8f80326750d304fa0a881201e956c57 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
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