summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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>
2016-01-16ONOSFW-152CNlukai3-10/+24
Onos Intergrates with compass Change-Id: I5b16764fe1b00f2065bb60879ab944cec36b9d62 Signed-off-by: CNlukai <lukai1@huawei.com> (cherry picked from commit ab1daa1c93d30ee505de30e6f4fc99de2877b1ee)
2016-01-15bugfix: opencontrail neutron.conf api_extensions_path wrong valuechenshuai@huawei.com1-1/+1
JIRA: COMPASS-262 Change-Id: I454a68dabe3271d96d37ed3812c7f7fcac68bcb9 Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com> (cherry picked from commit 8af3e2688a659e7f5a92b24cd0b594272914cc43)
2016-01-15compass: Align scenario short namesmeimei7-0/+301
Change-Id: Ic64acc0e5971b596d5ff77fc89d3867fe36f0281 Signed-off-by: meimei <meimei@huawei.com> (cherry picked from commit 7c7e58d3fa6d7d2b5deb02d68a767c98a7b7553a)
2016-01-14Update Huawei lab POD1 configurationJustin-chi1-9/+2
reset to 2 controller and 2 computers. Change-Id: I314d17022d4531c1cea548c4d21164a725365e66 Signed-off-by: Justin-chi <chigang@huawei.com> (cherry picked from commit dab9e32fc12461ea8f2f59d16ea05ffd5736cd68)
2016-01-14bugfix: mongodb's priority should consistent with keepalived for failovercarey.xu2-6/+6
JIRA: COMPASS-260 Change-Id: Iafb2f3a853fe05ac12a3275737f5edd1b987ffdd Signed-off-by: carey.xu <carey.xuhan@huawei.com> (cherry picked from commit b51e9555fb11e2d24e555a9122b810694bbd77ee)
2016-01-14bugfix: mongodb's priority should consistent with keepalived for failovercarey.xu1-1/+1
JIRA: COMPASS-260 Change-Id: I29e6e21e514e6dab5643e5558c81b851a4442e54 Signed-off-by: carey.xu <carey.xuhan@huawei.com> (cherry picked from commit da39c5ca863f133f6bbf978dce10b9d21b6b5399)
2016-01-13FIX:use rbd as default backendgrakiss1-1/+1
JIRA:COMPASS-263 - some testcases use http as backend, so only set default store to rbd Change-Id: Icd05d7f6926c2e0b607601f6e05a64b52b158aa9 Signed-off-by: grakiss <grakiss.wanglei@huawei.com>
2016-01-13create a virtual port on jumpserver for functestcarey.xu4-8/+15
- create a virtual port on jumpserver, for functest communicate with openstack admin network - force mtu to 1450 when vxlan mode - make only one mysql node primary(bug workaround) JIRA: COMPASS-243 Change-Id: I498ed05f4b1b64f4f4db2455dd58dd2b4e82ae82 Signed-off-by: carey.xu <carey.xuhan@huawei.com> (cherry picked from commit 94035e341ff51daf1b1a5ed297f78b8bcbf71882)
2016-01-13create a virtual port on jumpserver for functestcarey.xu2-0/+21
- create a virtual port on jumpserver, for functest communicate with openstack admin network JIRA: COMPASS-243 Change-Id: Ib6f0c56253bb26155f0856caeae11a809c92f276 Signed-off-by: carey.xu <carey.xuhan@huawei.com> (cherry picked from commit 53f210914dd53eaf257b65316bc8526b4a447918)
2016-01-13Disable ansible upgrade to latest version.Justin-chi1-1/+1
ansible 1.9.4 is used for bramaputra release. Change-Id: I42a33a17bbe90e7dda9b06a5fd7a4b4652b37fad Signed-off-by: Justin-chi <chigang@huawei.com> (cherry picked from commit c1bf434a78a3f3db92ba1c77c4a4466f73f023c2)
2016-01-12Merge "use new options instead of deprecated options for glance" into ↵shuai chen3-815/+89
stable/brahmaputra
2016-01-12use new options instead of deprecated options for glancecarey.xu3-815/+89
JIRA: COMPASS-247 Change-Id: If034fad5a17d6b1d462ae1a54bdb5d641173d720 Signed-off-by: carey.xu <carey.xuhan@huawei.com> (cherry picked from commit 4b9e28352916ff617082393c6596b4c1552656da)
2016-01-12use new options instead of deprecated options for keystonecarey.xu1-1296/+34
JIRA: COMPASS-246 Change-Id: I71ec405a842d08597cfc81de5de94ec8074c6786 Signed-off-by: carey.xu <carey.xuhan@huawei.com> (cherry picked from commit 5e7ec9c6e7af3315860fc5b56aceeef6b89abd87)
2016-01-11update huawei-us-pod1 network and dha information.Justin-chi2-23/+34
because the network is not very stable,so I change the configuration of the POD1 Change-Id: I6dbf55fc8f73b447256566025a463be9258ca62c Signed-off-by: Justin-chi <chigang@huawei.com> (cherry picked from commit c2dd674b7c65256dfa88d97a5604a592e9a024fd)
2016-01-06Merge "bugfix: wrong floating ip pool configuration of bare-deployment"shuai chen1-1/+2
2016-01-06bugfix: wrong floating ip pool configuration of bare-deploymentmeimei1-1/+2
JIRA: COMPASS-226 Change-Id: Ic08e9d52671c48fb5a9a3061620626423f21cd6d Signed-off-by: meimei <meimei@huawei.com>
2016-01-06Merge "bugfix: cinder v1 endpoint use real v1 api"shuai chen1-3/+3
2016-01-06bugfix: cinder v1 endpoint use real v1 apicarey.xu1-3/+3
JIRA: COMPASS-251 Change-Id: Id02ba2c8ee708dc06b65cf119499d3c89c05cf8f Signed-off-by: carey.xu <carey.xuhan@huawei.com>
2016-01-06bugfix: wrong floating ip pool configuration of bare-deploymentmeimei2-13/+5
temporarily remove host3 of baremental-deployment until host3's network is recoverd Change-Id: I760a5afeb229685844b6fb0f5c9577d810a422f2 Signed-off-by: meimei <meimei@huawei.com>
2016-01-06Merge "add config files of virtual-deployment"shuai chen5-0/+270
2016-01-06Merge "setup external network for openstack"shuai chen1-6/+6
2016-01-05Merge "Update disk space of virtual machine to 200G"shuai chen1-1/+1
2016-01-05setup external network for openstackmeimei1-6/+6
JIRA: COMPASS-226 Change-Id: Ia20a554056ed0226dbcb6f9f458f8ada0e319f28 Signed-off-by: meimei <meimei@huawei.com>
2016-01-05add config files of virtual-deploymentmeimei5-0/+270
JIRA: COMPASS-242 Change-Id: Iea798d7f4987685bf0e27dca4c9b600ae802fef0 Signed-off-by: meimei <meimei@huawei.com>
2016-01-05set nova default floating pool for functestcarey.xu2-5/+4
JIRA: COMPASS-241 Change-Id: I53528db5162aa8149e0edce88efc2aa158d175bd Signed-off-by: carey.xu <carey.xuhan@huawei.com>
2016-01-05Update disk space of virtual machine to 200Ggrakiss1-1/+1
JIRA: COMPASS-240 - the vm disk space is too small for vIMS testcase Change-Id: I39d9128590d2d15bd9b3fe7987d29a90f4b30094 Signed-off-by: grakiss <grakiss.wanglei@huawei.com>
2016-01-05FIX:update mgmt network for redhat versiongrakiss1-1/+1
JIRA: COMPASS-239 - change mgmt cidr for redhat version Change-Id: I02d1e82fcfe80a5d79440a5428f61fb5eac0c576 Signed-off-by: grakiss <grakiss.wanglei@huawei.com>