summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Updated from global requirementshavana-eol2013.2.4stable/havanaOpenStack Proposal Bot2014-09-192-3/+3
| | | | Change-Id: I68ca9943bd611061cf34f79d786b161226f13171
* Pin docutils to 0.9.1Ihar Hrachyshka2014-09-191-0/+1
| | | | | | | | | | | | | Docutils 0.10 breaks manpage generation in sphinx 1.1.3. A fix to sphinx has been merged, but not yet released (scheduled for dec 24-31). In the mean time, we should pin docutils to 0.9.1. Similar change was present before as I157f3c191bfc09d2191a3508d81bcbaea56205a6 but was incorrectly removed by later requirements syncs. Closes-Bug: 1091333 Change-Id: I157f3c191bfc09d2191a3508d81bcbaea56205a6
* Merge "Check host is not none in each availability zone" into stable/havanaJenkins2014-08-231-1/+3
|\
| * Check host is not none in each availability zoneGeorge Shuklin2014-04-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Check that host is not none before trying to parse the services that are up in each availability zone Change-Id: I757f35ca2fa84da3441b544280c1c430bf3e8fb8 Closes-Bug: #1297920 (adopted from commit 7f30ab5124618c5b11eebf9c6d69bcfd8a47adc3, change path from 'dashboards/admin/aggregate' to 'dashboards/admin/info') Original fix by Santiago Baldassin <santiago.b.baldassin@intel.com>
* | Merge "Set python hash seed to 0 in tox.ini" into stable/havanaJenkins2014-08-231-0/+3
|\ \
| * | Set python hash seed to 0 in tox.iniChristian Berendt2014-08-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New tox (>=1.7.0) sets a random python hash seed by default. This is generally good for testing because it will help keep projects working regardless of the hash seed, but horizon unittests don't currently pass with a random hash seed so set it to the python default seed. This change will allow us to use new tox again and remove the restriction on tox<=1.6.1 to run unittests. Also see Ib54364877a251db48c54dfdc43c503281ea1f04a. Change-Id: I8834487e8c7bcdbeae8397c1a10a18873976ce61 Partial-Bug: #1348818 (cherry picked from commit b30072e47ead3625cbf29a3b2955cae19a8e7533)
* | | Fix XSS issue with the unordered_list filterJulie Pichon2014-08-191-2/+6
|/ / | | | | | | | | | | | | | | | | When using the unordered_list filter in a Horizon table (as opposed to a template directly), autoescaping is not set by default and the input wasn't sanitised. Closes-Bug: #1349491 Change-Id: Id82eefe48ccb17a158751ec65d24f3ac779380ec
* | Replace UserManager with None in testsJamie Lennox2014-07-252-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | Don't access keystoneclient's UserManager in tests. This should be considered private data of keystoneclient and is not actually used by horizon tests. Conflicts: openstack_dashboard/test/test_data/keystone_data.py Change-Id: I261e79b31dfc7388adb3dc63a3a5e54042f05e54 Closes-Bug: #1347236 (cherry picked from commit 821619fff324ba1bc3f697f585a0c350573f24a2)
* | Merge "Fix multiple Cross-Site Scripting (XSS) vulnerabilities" into ↵Jenkins2014-07-106-6/+29
|\ \ | | | | | | | | | stable/havana
| * | Fix multiple Cross-Site Scripting (XSS) vulnerabilitiesJulie Pichon2014-07-086-6/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Ensure user emails are properly escaped User emails in the Users and Groups panel are being passed through the urlize filter to transform them into clickable links. However, urlize expects input to be already escaped and safe. We should make sure to escape the strings first as email addresses are not validated and can contain any type of string. Closes-Bug: #1320235 * Ensure network names are properly escaped in the Launch Instance menu Closes-Bug: #1322197 * Escape the URLs generated for the Horizon tables When generating the Horizon tables, there was an assumption that only the anchor text needed to be escaped. However some URLs are generated based on user-provided data and should be escaped as well. Also escape the link attributes for good measure. * Use 'reverse' to generate the Resource URLs in the stacks tables Closes-Bug: #1308727 Conflicts: horizon/tables/base.py openstack_dashboard/dashboards/admin/users/tables.py Change-Id: Ic8a92e69f66c2d265a802f350e30f091181aa42e
* | | Update test-requirements to fix sphinx build_docTristan Cacqueray2014-07-081-3/+1
|/ / | | | | | | | | | | | | | | | | Sphinx-1.2b3 is failing with this error: "'source_dir' must be a directory name". This change prevent that sphinx version from being pulled, it's a backport of 6a276638 Change-Id: Ic63d776bec5c0ace7207a532c29ee193d171ee63 Closes-Bug: #1339273
* | Fix issues with importing the Login formJulie Pichon2014-06-241-2/+2
| | | | | | | | | | | | | | | | | | The Login form lives in openstack_auth.forms and should be directly imported from that file. Change-Id: I42808530024bebb01604adbf4828769812856bf3 Closes-Bug: #1332149 (cherry picked from commit 345ccc9d503e6e55fe46d7813958c0081cc1cffe)
* | Merge "Bug fix on neutron's API to return the correct target ID" into ↵Jenkins2014-05-287-12/+50
|\ \ | | | | | | | | | stable/havana
| * | Bug fix on neutron's API to return the correct target IDGeorge Peristerakis2014-04-157-12/+50
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the class FloatingIpManager, the function filters the resulting list of ports with all available floating ips. The function now returns the target ID of a port with a floating IP associated to it. Added a new function to get this to pass. In the next phase is to refactor the floating ip api to allow a finer granularity. This will be useful later for managing floating ips. Conflicts: openstack_dashboard/dashboards/project/instances/tables.py Change-Id: I02286dbbb60318b0157992622ffdeeae45a71bc1 Closes-Bug: 1265872 (cherry picked from commit 86f87944900e6e713d2baaacec18f55cbe81d878)
* | Fix display of images in Rebuild InstanceKieran Spear2014-05-222-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The image list in Rebuild Instance is constructed from (id, name) pairs. As the name is a string, the transform function is never called unless image name is None. In that case it crashes the view. This change: - Builds the image list with (id, image) so the correct thing is passed to the transform - Corrects the size/name attributes - Handles None display name (displays id instead) - Set the name of one of the public images in glance_data.py to None so errors like these are picked up in the future. Change-Id: I0d1f8594cccc404c0dd6f254b70d23789817dd06 Closes-bug: #1258349 (cherry picked from commit c720b4f90e59ad76ef846c8ba5b6b6d91883ee66)
* | Merge "Get instance networking information from Neutron" into stable/havanaJenkins2014-04-296-68/+271
|\ \
| * | Get instance networking information from NeutronAssaf Muller2014-04-156-68/+271
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | project/instances, admin/instances and the instance details page all get networking information from Nova. However, with Neutron enabled, floating IP associations are done direcly with Neutron, meaning that Nova's DB will fall out of sync and thus the GUI won't reflect successful floating IP associations until Nova polls Neutron again and updates its DB. The polling can take up to several minutes to complete for consecutive floating IP operations. The solution is to update instances' networking information from Neutron immediately after the call to list Nova instances. Conflicts: openstack_dashboard/dashboards/project/instances/tests.py openstack_dashboard/dashboards/project/instances/views.py Closes-Bug: #1265032 Change-Id: I0382fa9a4a9fff21e7b4d05cd3b76783f826735f (cherry picked from commit 715d6b822838009530b7792cd7749164ae3fc663)
* | Bump stable/havana next version to 2013.2.4Adam Gandelman2014-04-211-1/+1
|/ | | | Change-Id: I396562a89b4f21d486e2ab83b829047f8c3609f5
* Do not release FIP on disassociate actionRob Raymond2014-04-092-5/+1
| | | | | | | | | | In Instances panel, associate and disassociate Floating IPs now will be consistent. Fixes bug #1247245 Change-Id: I6a84c43b8bc69fa08c63abff5343144cc4000c37 (cherry picked from commit 348ffe41c49a9a23c9c7da65cbceaf363b13a95e)
* Introduces escaping in Horizon/OrchestrationCristianFiorentino2014-04-094-11/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) Escape help_text a second time to avoid bootstrap tooltip XSS issue The "Description" parameter in a Heat template is used to populate a help_text tooltip in the dynamically generated Heat form. Bootstrap inserts this tooltip into the DOM using .html() which undoes any escaping we do in Django (it should be using .text()). This was fixed by forcing the help_text content to be escaped a second time. The issue itself is mitigated in bootstrap.js release 2.0.3 (ours is currently 2.0.1). 2) Properly escape untrusted Heat template 'outputs' The 'outputs' parameter in a Heat template was included in a Django template with HTML autoescaping turned off. Malicious HTML content could be included in a Heat template and would be rendered by Horizon when details about a created stack were displayed. This was fixed by not disabling autoescaping and explicitly escaping untrusted values in any strings that are later marked "safe" to render without further escaping. Conflicts: openstack_dashboard/dashboards/project/stacks/mappings.py Change-Id: Icd9f9d9ca77068b12227d77469773a325c840001 Closes-Bug: #1289033 Co-Authored-By: Kieran Spear <kispear@gmail.com>
* Merge "Reduce number of novaclient calls" into stable/havana2013.2.3Jenkins2014-03-281-2/+3
|\
| * Reduce number of novaclient callsMatthias Runge2014-03-061-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, each client creates a new session for each call. This fix makes novaclient re-use sessions in the most obvoius cases. Conflicts: openstack_dashboard/api/nova.py Partial-Bug: #1247056 Change-Id: Ie99ecb66304cf40e4f5fdd31fab5162ed11b863e (cherry picked from commit ddc479272f5402ff778c45892acc3ac7613b7c11)
* | Don't copy the flavorid when updating flavorsNicolas Simonds2014-03-132-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Nova API makes the implicit assumption that flavorids are unique, so if one creates two flavors with the same flavorid, subsequent requests for flavor information can vary between "inaccurate" and "wildly f*cking inaccurate" From an end-user perspective, it makes it look like data such as flavor access settings get lost between edits (because the API pulls the access list from the wrong flavor) Let the API assign a new flavorid on changes. The comments around the handler code imply that is the desired behaviour, anyhow. Cherry-picked from 4100a1cbc24184b58d5049dfb601b18e29e6107d Change-Id: I5403202396a7b136b0ae8637d6aae1cf32550747 Closes-Bug: 1276371
* | Allow snapshots of paused and suspended instancesZhenguo Niu2014-03-101-1/+1
| | | | | | | | | | | | Change-Id: Id483d13d8d329aee4a57d0a89e6368fab3b201ec Closes-Bug: #1256821 (cherry picked from commit 860b2a0be11ceb2e57c4c0d0e7ff020325277c78)
* | Merge "Bump stable/havana next version to 2013.2.3" into stable/havanaJenkins2014-02-281-1/+1
|\ \
| * | Bump stable/havana next version to 2013.2.3Alan Pevec2014-02-131-1/+1
| |/ | | | | | | Change-Id: Ia5b940faf01df6cae58df1f4b4f5e8fa2f3f078a
* | Merge "Fixing tests to work with keystoneclient 0.6.0" into stable/havanaJenkins2014-02-281-0/+1
|\ \ | |/ |/|
| * Fixing tests to work with keystoneclient 0.6.0David Lyle2014-02-141-0/+1
| | | | | | | | | | | | | | | | | | | | Another item needs mocking with the new release of python_keystoneclient. Adding it to mocked keystoneclient.Client object. Closes-Bug: #1279907 Change-Id: I3c43a7290a6e05c718082dcad369162bf21e3603 (cherry picked from commit 043085f812a1d06e8e082b2dbd52f406172bbfff)
* | Import translations for Havana 2013.2.2 udpate2013.2.2Akihiro Motoki2014-02-0327-4704/+4985
| | | | | | | | | | | | | | | | | | | | | | * Import the latest translations of ~100% completed languages. 12 translated languages are avaialable. * Update POT files (English PO file) This commit is directly proposed to stable/havana branch because strings are different between stable/havana and master branches. Change-Id: I117ea214d121d4c70e8f3679c88d0c758c586f99
* | Merge "Fix inappropriate logouts on load-balanced Horizon" into stable/havanaJenkins2014-02-012-6/+6
|\ \
| * | Fix inappropriate logouts on load-balanced HorizonMatthias Runge2014-01-302-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The session timeout code in the horizon/middleware.py can cause inappropriate timeouts/logouts when running Horizon behind a load balancer on two machines that are slightly out of sync time-wise. Use timestamps rather than datetime as the arithmetic is simpler. Closes-bug: #1243277 (cherry-picked from commit 13355dacdbfa9ef14a4e1c16afeffaece5c13a39, minus the unrelated settings.py changes.) Change-Id: I23159d2dee7fc05653a99fc89fbfd4d52e988df5
* | | Merge "Update Transifex resource name for havana" into stable/havanaJenkins2014-01-311-3/+3
|\ \ \
| * | | Update Transifex resource name for havanaAkihiro Motoki2014-01-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I18N team decided to maintain Horizon translations for Havana stable branch and Transifex resource names is renamed to *-havana. .tx/config in Horizon stable/havana repo needs to be updated. Closes-Bug: #1274005 Change-Id: I1a580f11d85ba5ce52898f42ee1229df224e940f
* | | | Merge "Bad workflow-steps check: has_required_fields" into stable/havanaJenkins2014-01-311-8/+2
|\ \ \ \
| * | | | Bad workflow-steps check: has_required_fieldsMatthew Wood2014-01-221-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many of the tabs on the Instance Creation screen don't show a "*" despite having require fields. This is due to faulty logic in determining whether the workflow-step has require fields. (Previously, only keys from the contributes list were checked.) Closes-Bug: 1252005 Change-Id: Id609da27c51f8d4725683d7fd1534ead0c3bb984 (cherry picked from commit 788ec08c4f3e53b1f3dbaa40c19a0a71c21cdf42)
* | | | | Merge "disable volume creation, when cinder is disabled" into stable/havanaJenkins2014-01-313-15/+21
|\ \ \ \ \
| * | | | | disable volume creation, when cinder is disabledMatthias Runge2014-01-273-15/+21
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before this patch, it's possible to try to create a volume from an image, create a volume during instance creation etc. The same applies to create a volume from snapshot. Closes-bug: 1267438 (cherry picked from commit 33076684a9db19b5e25ba517ce3ac90bb5c25fc0) Conflicts: openstack_dashboard/dashboards/project/images_and_snapshots/images/tables.py openstack_dashboard/dashboards/project/instances/workflows/create_instance.py Change-Id: Ib573487938e0833668b002d05574e587734ef829
* | | | | Merge "Specify tenant_id when retrieving LBaaS/VPNaaS resource" into ↵Jenkins2014-01-309-79/+123
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | stable/havana
| * | | | Specify tenant_id when retrieving LBaaS/VPNaaS resourceAkihiro MOTOKI2013-12-209-79/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Neutron API, resources from all tenants are listed when retrieving a list of resources with admin role. Horizon project dashboard is for project-specific operations, so we should retrieve only resources of the given project. LBaaS/VPNaaS panels have this problem, but FWaaS does not. router_list should be called with tenant_id filter too. This commit also fixes VPN/FWaaS tests so that it extract tenant_id from request attribute rather than use tenant_id of test_data. Change-Id: I080e6c6d1e426a878c1d088763bbc7e5add15820 Closes-Bug: #1244126 (cherry picked from commit 630b43349160f8b35d54196aabaa6e1afe5e4d61)
* | | | | Merge "Give HealthMonitor a proper display name" into stable/havanaJenkins2014-01-292-7/+37
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Give HealthMonitor a proper display nameAvishay Balderman2013-12-032-7/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes-Bug: #1237377 Change-Id: If901008171d964bf93941c0b6de2c66e20f0aa27 (cherry picked from commit 3a28423cd96596edd5e30a1a53956fa6c93f439f)
* | | | | Merge "Common keystone version fallback" into stable/havanaJenkins2014-01-282-1/+7
|\ \ \ \ \
| * | | | | Common keystone version fallbackYves-Gwenael Bourhis2013-12-202-1/+7
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If OPENSTACK_API_VERSIONS["identity"] was not set in local_settings.py, django_openstack_auth and horizon had their own fallback method which did not necessarily fallback on the same version and was leading to discrepancies and erratic behavior. Refactored in order to use the same fallback method defined in django_openstack_auth.utils Change-Id: I583d49a73077a20baf5f01628b0b6e8480296964 Closes-Bug: #1231357 (cherry picked from commit ea447939a88dd80e54612a49a66ae57243e1164b)
* | | | | Merge "unify keypair name handling" into stable/havanaJenkins2014-01-272-6/+23
|\ \ \ \ \
| * | | | | unify keypair name handlingMatthias Runge2014-01-102-6/+23
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CreateKeyPair and ImportKeypair handled name checks in a different way. When importing a keypair, one got a generic error message without a hint, that the name was wrong. This is the backport to Havana. Managed to drop the original changei, which was Ie82c0cd21f70aae3f55b84a1c05c9f170eaec312 Closes-Bug: #1265563 (cherry picked from commit eafe0b260d24f65d6f0b0487a74c352a01a53d84) Change-Id: I10d5a7151242afeeed59965b361c89cc97b53b46
* | | | | Merge "Change how scrollShift is calculated" into stable/havanaJenkins2014-01-271-1/+1
|\ \ \ \ \
| * | | | | Change how scrollShift is calculatedFacundo Maldonado2013-12-211-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Firefox $('body').scrollTop returns 0, that's why the modal appear outside the visible screen. Added $('hmtl).scrollTop. var scrollShift = $('body').scrollTop() || $('html').scrollTop() Closes-Bug: 1251361 Change-Id: Icf691eb140e091615a98f1fbd415428cd418ba9e (cherry picked from commit 8950b90d1777e265f98379098cebef7517642efe)
* | | | | Merge "fix help text in "Create An image" window" into stable/havanaJenkins2014-01-271-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | fix help text in "Create An image" windowKun Huang2014-01-081-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the "Create An image" window, there are "minimum disk" and "minimun memory" text input. But both help text on the two text inputs are using "the minimum disk size...". Actually for the second one we should say "the minimum memory size...", and now this patch fix this. Change-Id: Ife19acba5fafb41d99e9416d2f9e8082b9eaef53 (cherry picked from commit 0314d54391775f09b35759a650dbae2e2ba567aa)
* | | | Merge "Wrong marker sent to keystone" into stable/havanaJenkins2014-01-262-6/+3
|\ \ \ \
View Lorry Controller Status