summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-01-30Merge "FIX:storage volume invalid after reboot" into stable/brahmaputraJustin chi2-0/+25
2016-01-30Merge "FIX: use CEPH group instead of all" into stable/brahmaputraJustin chi1-2/+2
2016-01-30Merge "Use wait_for instead of sleep to fetch keyring" into stable/brahmaputraJustin chi1-2/+2
2016-01-30Merge "add apache2 headers for shell scripts and ansible scripts" into ↵Justin chi231-0/+1848
stable/brahmaputra
2016-01-30FIX:storage volume invalid after rebootgrakiss2-0/+25
JIRA:COMPASS-287 - losetup device will be invalid after reboot,need rebuild Change-Id: Ie9046495954cc371a61d1c9f2e1aaa901cb20b42 Signed-off-by: grakiss <grakiss.wanglei@huawei.com> (cherry picked from commit d3ba758592ea7aa07931667fb265b574de0dfb80)
2016-01-30FIX: use CEPH group instead of allgrakiss1-2/+2
JIRA: COMPASS-278 - some env dont deploy ceph ,and will fail for ceph node not found Change-Id: I399fc301486ca1957ffd404091ddf7984ff36cb8 Signed-off-by: grakiss <grakiss.wanglei@huawei.com> (cherry picked from commit 9228e6791f78ce0ff29618d3f9f9b942fa51c26f)
2016-01-30Use ceph_adm node to create global configgrakiss2-15/+15
JIRA: COMPASS-276 - use ceph_adm for global config Change-Id: I9229699909aff6ba0f0f429e8a883746cf37e5dc Signed-off-by: grakiss <grakiss.wanglei@huawei.com> (cherry picked from commit 36ab89d5ddcd76c2bf7c7db5e6d60887ae44b12f)
2016-01-30Use wait_for instead of sleep to fetch keyringgrakiss1-2/+2
JIRA: COMPASS-275 - fetch is not reliable, and sleep is also not reliable - wait_for can be used to confirm the file existence Change-Id: Ie44715e1b8756398f656fdee2c3243f03967e29a Signed-off-by: grakiss <grakiss.wanglei@huawei.com> (cherry picked from commit 8f997e075da72337a5c60158708081bc40d77c67)
2016-01-30add apache2 headers for shell scripts and ansible scriptscarey.xu231-0/+1848
Change-Id: I34b66d76f59f4300c7ce4e7bd9dc7c1eaddfb384 Signed-off-by: carey.xu <carey.xuhan@huawei.com> (cherry picked from commit b43e48e988a8eb28ac4ea43176a22413a19c0599)
2016-01-30Merge "add files for build onos/odl/open-contrail" into stable/brahmaputraJustin chi5-3/+62
2016-01-30deploy CEPH nodes parallellygrakiss21-2/+427
JIRA:COMPASS-264 - do not use ceph-deploy - do not need centeral node to deploy ceph Change-Id: I0f9c459060a2fccbad73a323697ec23ea2115410 Signed-off-by: grakiss <grakiss.wanglei@huawei.com> (cherry picked from commit 2616357bbf1d5cfc1f7e3923e12b8adfc5627fc6)
2016-01-30add files for build onos/odl/open-contrailbaigk5-3/+62
JIRA: COMPASS-258 Change-Id: Ie49a49971c00d1fee291bbdf8d98b06b18854651 Signed-off-by: baigk <baiguoku@huawei.com> (cherry picked from commit b7f58edf25f41c09e4fe1bd72283ad350e80fb1a)
2016-01-29bugfix: l2 fwd move external bridge on br-exchenshuai@huawei.com1-9/+12
JIRA: COMPASS-292 Change-Id: I242729b32c8f29e3aafe7ef5797acd14429a2c8c Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com> (cherry picked from commit 0664407eaaf934b909386509f3adafec4387aa37)
2016-01-29Merge "bugfix: l3 fwd for odl" into stable/brahmaputrachenshuai@huawei.com1-15/+9
2016-01-29Document update for BrahmaputraJustin-chi8-42/+527
JIRA: COMPASS-75 add installation instruction add FAQ.rst(draft) and release-notes(draft) add some correction Change-Id: I8fc48c79eeea06bc2efafce2eca72ebd9b71be16 Signed-off-by: Justin-chi <chigang@huawei.com> (cherry picked from commit 080b1de19bc76a3e4435a73151d180d2267e4e59)
2016-01-29bugfix: l3 fwd for odlchenshuai@huawei.com1-15/+9
JIRA: COMPASS-289 Change-Id: I5a9ec973cca73a68b394b484718a9c9a73361d7a Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com> (cherry picked from commit 9d407429fabe6490fabb9418b6b920bc40cdbc12)
2016-01-28[compass] add new nodes's configurationmeimei2-0/+180
Change-Id: Ib8705c2057d39b62e090bf30be421a8ba2652407 Signed-off-by: meimei <meimei@huawei.com>
2016-01-27bugfix: haproxy for odlchenshuai@huawei.com4-3/+145
JIRA: COMPASS-288 Change-Id: Ifd5ce06237570bbc524958854a4859515cc098b0 Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com> (cherry picked from commit 9d9b4c1aaaee795e93b07331645ed8589152d03e)
2016-01-27Merge "bugfix: prepare python venv" into stable/brahmaputrashuai chen4-14/+22
2016-01-27bugfix: prepare python venvcarey.xu4-14/+22
JIRA: bugfix_python_env Change-Id: Ie7f3e295c7c283ff3e805bed13029174c2dda258 Signed-off-by: carey.xu <carey.xuhan@huawei.com>
2016-01-27[compass] bugfix: wrong role namemeimei1-5/+5
Change-Id: Id0cc4e88cbe3fec278b8f43385ee105438411075 Signed-off-by: meimei <meimei@huawei.com>
2016-01-26change the config of baremetalbaigk4-8/+43
JIRA: COMPASS-286 Change-Id: I32fed288f41def3e49bc270d716c383a16bf0bcf Signed-off-by: baigk <baiguoku@huawei.com>
2016-01-25bugfix: odl cluster function problemchenshuai@huawei.com3-12/+39
JIRA:COMPASS-285 Change-Id: I78eebc04576141dc48961e0beeb9408b28b10793 Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com> (cherry picked from commit efa46a5b06c8c138aadbf396f6431acd7b606ed9)
2016-01-25bugfix: change opencontrail role namechenshuai@huawei.com14-46/+48
JIRA: COMPASS-284 Change-Id: If47438396124f805efa739bbfdd1c61d4892b4a5 Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com> (cherry picked from commit 6c1adf0e4c442d1a97bb1d4ee5043937e6e596c8)
2016-01-23[compass] add opencontrail confmeimei2-0/+80
Change-Id: If90583c59c6093b2875599f5138db40635465bcd Signed-off-by: meimei <meimei@huawei.com>
2016-01-23Modify build.conf for Brahmaputra releaseJustin-chi1-9/+23
reorganize build.config for Brahmaputra. reduce the size of ISO release. Change-Id: Ibaa11958782b5705e3a371c8b55942cd6a6ba5d2 Signed-off-by: Justin-chi <chigang@huawei.com> (cherry picked from commit 5ebe48585f488eef6e432e6bc1298ecaf9f60557)
2016-01-22bugfix: make reboot_hosts asynccarey.xu1-1/+1
Change-Id: If9f7b8a091edb4ac3d057f5e87c62ab10a7a0674 Signed-off-by: carey.xu <carey.xuhan@huawei.com> (cherry picked from commit e061c95577fdbc71bcda33355c15e6c76ca72ea5)
2016-01-21bugfix for jumpserver on ubuntu 14.04.3carey.xu3-10/+8
Change-Id: I59a41ca1ec2c0e576b590d5de39c04cd19273614 Signed-off-by: carey.xu <carey.xuhan@huawei.com> (cherry picked from commit 4a4a18e97eed73c1b82ae83b65cd765160f8ae6c)
2016-01-21bugfix: opencontrail contrail-snmp-collector configuration errorchenshuai@huawei.com6-3/+12
JIRA: COMPASS-280 Change-Id: I51cf44fdf36aa7665ffb7ab04942fb41cefa0027 Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com> (cherry picked from commit d15a9e4a62822af5347bba1f61c41c774de0d8ab)
2016-01-21bugfix: opencontrail automation deployment scriptschenshuai@huawei.com21-112/+393
JIRA: COMPASS-277 Change-Id: Ia1f52c6e8e3de520cf06de99550c17879aaed2d7 Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com> (cherry picked from commit 77944ac2791a631cfa785d16cc32dae8082b2719)
2016-01-21bugfix: opencontrail neutron and nova plugins codechenshuai@huawei.com8-2/+79
JIRA: COMPASS-274 Change-Id: I6ee4b9fac51a0fc5f4ac9916ea16ab9d363ec943 Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com> (cherry picked from commit 4113bc2656c86f6057dcf3bc5f18ac1e3619fd45)
2016-01-21bugfix: nova default parameter does't support vrouter, change to use ↵chenshuai@huawei.com1-12/+12
opencontrail driver JIRA: COMPASS-270 Change-Id: I8d35a0c5d36b48ea306473784dfd4a23abffaa6e Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com> (cherry picked from commit 6d0c31acb8e9702824f0697eb9916886b0324797)
2016-01-21bugfix: remove opencontrail rabbit password parameterchenshuai@huawei.com1-1/+1
JIRA: COMPASS-256 Change-Id: I43debb40a58fd691673bc0f3d68191a6fc41f585 Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com> (cherry picked from commit 539af1ee4869e0a120bbc29f4b4cd995b38c683c)
2016-01-21bugfix: remove rabbitmq codes in opencontrail rolechenshuai@huawei.com8-173/+1
JIRA: COMPASS-253 Change-Id: I53911352eb96a15257a513ea4154f93147dd283c Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com> (cherry picked from commit ef44ca47c6e8d3fbda915c79630bba0db15a4c84)
2016-01-21bugfix: for sometimes installation hang upcarey.xu1-36/+37
Change-Id: Idd266cf986e0546b0b80d6486698d340c530ff37 Signed-off-by: carey.xu <carey.xuhan@huawei.com> (cherry picked from commit 8b1206a666d2d825a8aed654e07e0b60c9470d93)
2016-01-21add options for ubuntu installationcarey.xu1-0/+5
- When install ubuntu on HUAWEI 1288v3 server, sometimes it will hung until wathchdog timeout. Add options for avoid this case. Change-Id: Id5ee4fb6d332ab1a60b2482d2af03949e2a75334 Signed-off-by: carey.xu <carey.xuhan@huawei.com> (cherry picked from commit 8aa5bbf80fe83c440cb6522c6e5f774f9a5e3df6)
2016-01-21remove GPL headercarey.xu1-17/+0
- the status_callback.py is writed by us, but forget to remove headers Change-Id: I4451837c53d02be4beb6dcfa33c24068098ebd5c Signed-off-by: carey.xu <carey.xuhan@huawei.com> (cherry picked from commit 0c5228ced8950c3a988bdb5eafe3263a07a73070)
2016-01-21Merge "bugfix: workaround for opencontrail" into stable/brahmaputrachenshuai@huawei.com12-60/+86
2016-01-21FIX: kibana is Apache2.0 not GPLgrakiss2-270/+1
JIRA: COMPASS-283 - get wrong license in rpmbuild.sepc ,dont worry Change-Id: Ie97441d28b7886d4b329872dc281e8495298adb6 Signed-off-by: grakiss <grakiss.wanglei@huawei.com> (cherry picked from commit 482aa0f3fc25e9d55aa8916b5259cd2ef86214c5)
2016-01-21Merge "bugfix: opencontrail parameter network_api_class in nova.conf to ↵chenshuai@huawei.com1-12/+12
nova.network.neutronv2.api.API" into stable/brahmaputra
2016-01-21Merge "bugfix: opencontrail remove nova para modification in nova.conf on ↵chenshuai@huawei.com1-19/+19
controller" into stable/brahmaputra
2016-01-21bugfix: workaround for opencontrailchenshuai@huawei.com12-60/+86
JIRA: COMPASS-271 Change-Id: Ib4bbc0536ed8877f5e38150e5d710578345ac56b Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com> (cherry picked from commit 6b168a9b8c44c141f71c2eab7e51973f3523f912)
2016-01-21bugfix: opencontrail parameter network_api_class in nova.conf to ↵chenshuai@huawei.com1-12/+12
nova.network.neutronv2.api.API JIRA: COMPASS-267 Change-Id: I8f74c61e2f1efe289c198ce4d1bd5f1ef72ac2b5 Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com> (cherry picked from commit d8098aec2e2ba0be52bafd8ebdfb3954224d2cc7)
2016-01-21bugfix: opencontrail remove nova para modification in nova.conf on controllerchenshuai@huawei.com1-19/+19
JIRA: COMPASS-265 Change-Id: Ic8463dbb5acfc98d049e5468789b88934aca3ff7 Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com> (cherry picked from commit 816e0f01e57666c4f6c8c03b780a81bd5a35e89a)
2016-01-21bugfix: index of haproxy_hosts error in opencontrail webui scriptchenshuai@huawei.com1-2/+2
JIRA: COMPASS-261 Change-Id: I46055b1baa8cb9fe8744c40659ab8abf07d00923 Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com> (cherry picked from commit 293b868b24e70ed1440339836f33be87ea05e364)
2016-01-21Merge "bugfix: opencontrail neutron.conf api_extensions_path wrong value" ↵chenshuai@huawei.com1-1/+1
into stable/brahmaputra
2016-01-18ONOSFW-152CNlukai1-1/+1
Onos Intergrates with compass Change-Id: I17a1b35e52c2c5003b74f8bb79dcf117970fe7f9 Signed-off-by: CNlukai <lukai1@huawei.com> (cherry picked from commit 135f289728091450aba7b10f55013bd18d2f45d3)
2016-01-18modify vm slave configmeimei1-9/+9
Change-Id: Ia97b780b8c4a01e2c5b4236d4646621f14dbc56f Signed-off-by: meimei <meimei@huawei.com>
2016-01-18bugfix: SSH permissions error when resizing or migrating an instancecarey.xu2-6/+83
- make all host cant ssh login each other with out password, so nova can resize on diffrent hosts - remove some error httpchk options in haproxy JIRA: COMPASS-269 Change-Id: If9d75bc94446000ed1a8fb7bbd777ae205ecd630 Signed-off-by: carey.xu <carey.xuhan@huawei.com>
2016-01-18change ceilometer polling interval to 300scarey.xu1-0/+8
- tempest testcases only wait 300s for meters, but default ceilometer collector polling interval is 600s, so the testcases will raise timeout exception. we change the default polling interval to avoid this. Change-Id: I33479a4e12798e96067db7bab844ad952d40b20c Signed-off-by: carey.xu <carey.xuhan@huawei.com>