summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Workaround for 'File exists' test failureDoug Fish2014-09-303-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds code to create the assets directory that django_pyscss intends to create for scss. This avoids throwing an exception in concurrency scenarios Change-Id: Ic55e2a7ce59ec9b7550a7412697cb8d6563d98a3 Closes-bug: #1367590
* | | | | Merge "Updated from global requirements"Jenkins2014-09-301-1/+1
|\ \ \ \ \
| * | | | | Updated from global requirementsOpenStack Proposal Bot2014-09-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5ebf657fddc2ba901ea98af93586eb6daa518ac2
* | | | | | Merge "Add HA mode support for Neutron router"Jenkins2014-09-3012-68/+269
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Add HA mode support for Neutron routerAkihiro Motoki2014-09-2612-68/+269
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HA (high availability) mode support is one of the important topics in Neutron Juno, and this patch adds HA router mode support to Horizon. This commit also changes the default value of enable_distributed_router in the example local_settings.py to False. In Juno release of Neutron, the distributed router and L3 HA mode cannot be enabled at the same time and only L3-agent deployment with L3 Router service plugin support both features. Thus I believe it is reasonable to make both options default to False to avoid unnecessary confusions to operators. Closes-Bug: #1370110 Change-Id: I77b0292b761f08b4580846f6d58443f7df9a1f6b
* | | | | | Merge "Imported Translations from Transifex"Jenkins2014-09-3036-5322/+7207
|\ \ \ \ \ \
| * | | | | | Imported Translations from TransifexOpenStack Proposal Bot2014-09-3036-5322/+7207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic411f3e892bfbfef4fba0723b63e01cc7b8939fd
* | | | | | | Merge "Use identity operator in horizon.modals.js"Jenkins2014-09-301-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Use identity operator in horizon.modals.jsDoug Fish2014-09-291-1/+1
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jshint logs usage of the equality operator as an error. Change-Id: Ia5478981f6ce87e77c65bcc569ae542eeeff099f Closes-Bug: #1375401
* | | | | | | Merge "Persist usage start and end dates in the session"Jenkins2014-09-301-4/+11
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Persist usage start and end dates in the sessionJustin Pomeroy2014-09-251-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the usage start and end dates to the user's session so they are saved while navigating between pages. Closes-Bug: #1373651 Change-Id: I3046b5533eb96f85fb2f90e63b3ff84360ad14c4
* | | | | | | Merge "Redefine instance.security_groups as list"Jenkins2014-09-301-4/+4
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Redefine instance.security_groups as listThomas Goirand2014-09-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is the 2nd time I am patching Horizon to fix a Django 1.7 patch: the rework of the tests seems to have dropped the fix, so I have to do the work again. Reviewer: please make sure this doesn't happen again, and that we don't go back to .first(). Please see: https://review.openstack.org/111934/ The two tests modified here were incorrectly defining instance.security_groups as a single value instead of a list. Apparently Django 1.7 is no longer happy trying to iterate something that is not an iterable. The other test_instance_details_*() were already doing the correct thing so just copy over the logic. Change-Id: I92ae19e937e0e3a482fa424585b926e853c4ce8b Closes-Bug: #1374919
* | | | | | | Merge "[Sahara] Added ability to specify security groups for node group"Jenkins2014-09-295-5/+66
|\ \ \ \ \ \ \
| * | | | | | | [Sahara] Added ability to specify security groups for node groupAndrew Lazarev2014-09-245-3/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Known issues: 1. Security groups added to the same page as general parameters. Page is a little overloaded now. Will improve this later. Change-Id: Ieb224ea4db2adc46073b86e7181981ea598c9a8f Blueprint: cluster-secgroups Closes-Bug: #1364659
* | | | | | | | Merge "Imported Translations from Transifex"Jenkins2014-09-292-656/+657
|\ \ \ \ \ \ \ \
| * | | | | | | | Imported Translations from TransifexOpenStack Proposal Bot2014-09-292-656/+657
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4daa1763b261260bfdea115981814b6e91ac9c19
* | | | | | | | | Merge "Job Execuiton form improvement"Jenkins2014-09-291-54/+56
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Job Execuiton form improvementNikita Konovalov2014-09-251-54/+56
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The form controls are now aligned using bootstrap 3 classes. JS parts updated to work with new layout. Closes-Bug: #1373160 Change-Id: Id768349b132c91851839bfd208e955ddc6954b41
* | | | | | | | | Merge "Fixes downloading a keypair"Jenkins2014-09-294-2/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixes downloading a keypairnikunj25122014-09-234-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the invalid error which user gets when downloading a keypair that wasn't saved from the keypair download link from the keypair download page. When user clicks the download link, i just sending that to a different url and then deleting the keypair and then again creating it with same name. Change-Id: I4f9166f112487a500d23f9cc98b98660be2ebe55 Closes-bug: #1182797
* | | | | | | | | | Merge "Fix concatenation in Network and Router actions"Jenkins2014-09-295-12/+83
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix concatenation in Network and Router actionsDoug Fish2014-09-255-12/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove concatenation and pluralization issues from Delete Network, Delete Subnet, Delete Router Rule, Clear Gateway, and Delete Network Profile Change-Id: I0898b446abd79672b43b55be62dba6250a4fdd58 partial-bug: 1307476
* | | | | | | | | | | Merge "Fix concatenation in more misc actions"Jenkins2014-09-294-12/+86
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix concatenation in more misc actionsDoug Fish2014-09-254-12/+86
| | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove concatenation and pluralization issues from Evacuate Host, Sell Puppies (renamed from Delete Puppies. I cannot condone the deleting of virtual puppies.), Delete Continer, Delete Object, Delete Stack Change-Id: Ia6eb39cb2d736345afbdb3bfce8cb61bb2586871 partial-bug: 1307476
* | | | | | | | | | Imported Translations from TransifexOpenStack Proposal Bot2014-09-2812-3167/+3511
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ife4275e9e439736320c4523f6a933ce315cc20e8
* | | | | | | | | | Merge "Disable buttons opening the modal forms on page unload"Jenkins2014-09-271-0/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Disable buttons opening the modal forms on page unloadVlad Okhrimenko2014-09-251-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If button which opens a modal form is clicked after page started reloading, form will disappear once reload is finished. To avoid this glitch make user unable to press such buttons until reload finishes. Change-Id: Id81a5e108644f99ee939296b54835f4f4ac2aaa7 Closes-Bug: #1357331
* | | | | | | | | | | Merge "Fix for Data Processing Templates copy"Jenkins2014-09-279-31/+171
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix for Data Processing Templates copyNikita Konovalov2014-09-259-31/+171
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Cluster Template can now be copied even if it does not contain the node_group_template_id field. Utils refactored to use Sahara client correctly. Change-Id: If876cb5692feb772e5c7ca8fb529033bed9cc5a3 Closes-Bug: #1349807
* | | | | | | | | | | Merge "Imported Translations from Transifex"Jenkins2014-09-2719-11175/+12544
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Imported Translations from TransifexOpenStack Proposal Bot2014-09-2619-11175/+12544
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0b834e58b373c7c1179a3d56fe3f78415131b345
* | | | | | | | | | | Merge "Fixing issue with editing N1K network profiles"Jenkins2014-09-276-34/+176
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixing issue with editing N1K network profilesAbishek Subramanian2014-09-256-34/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This resolves issues surrounding the update network profiles for the Cisco N1K profiles when used with the N1K neutron plugin. Issue resolved include the edit form opening up properly and also addressing which fields are editable and which not. Also adding new unit tests. Closes-bug: #1260435 Change-Id: I318057a9f5870d4a25ebf461d5fc67e4a03d54d8
* | | | | | | | | | | | Merge "Allow setting config drive option when launching instance"Jenkins2014-09-274-17/+97
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Allow setting config drive option when launching instanceJustin Pomeroy2014-09-094-17/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a "Configuration Drive" checkbox to the Advanced tab of the Launch Instance workflow, if the config drive extension is supported. This allows setting the config drive option when launching an instance. Change-Id: Ib4e4e18251f4f024a61dabb646cda79a7c88582d Closes-Bug: #1366842
* | | | | | | | | | | | | Merge "Updated from global requirements"Jenkins2014-09-271-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Updated from global requirementsOpenStack Proposal Bot2014-09-261-3/+3
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I471e0c1d7b15835ef16cf11c72401335b3a834e4
* | | | | | | | | | | | | Merge "Making credentials optional for data sources"Jenkins2014-09-261-14/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Making credentials optional for data sourcesChad Roberts2014-09-091-14/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Username/password credentials are now optional fields when creating a data source. This is possible because a fully updated sahara system will use trusts to grant/revoke permissions rather than passing around a username/password. Change-Id: I7df556295e7e1b5c5e73230b294d4e8f8b7f05f3 Closes-Bug: #1367394
* | | | | | | | | | | | | | Merge "Fix concatenation in data processing actions"Jenkins2014-09-268-54/+216
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix concatenation in data processing actionsDoug Fish2014-09-258-54/+216
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove concatenation and pluralization issues from Delete Job, Launch Job (incl Launch Job, Launch New Cluster, Choose Plugin, Relaunch, Relaunch new cluster), Delete Job binary, Delete Data source, Delete Template, Delete Job execution, Delete Cluster, Unregister Image, and Delete Template actions. Change-Id: Idb615f4e2830ea5d9ddd0f871bfb3d90854f45f5 partial-bug: 1307476
* | | | | | | | | | | | | | Merge "Checking session timeout before authentication"Jenkins2014-09-266-21/+110
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Checking session timeout before authenticationYves-Gwenael Bourhis2014-09-256-21/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If both the keystone token and the session expired, the user was asked to login twice. This is because the token expiration was not checked. When a user had timed out both in session and keystone token validity, the user was asked to log in, then the timestamp was checked, and the user logged out again and asked to log in a second time. We now check both the timestamp and keystone token validity before authentication validity and force back the login page to retrieve a new keystone token, avoiding the timeout race condition between session and token validity which was forcing a dual login. A keystone token expiration is now considered as a session timeout too. Also, a page can start loading while the token is valid, and finish while it's invalid. This was leading to errors during the page loading. We now set a TOKEN_TIMEOUT_MARGIN period in seconds which allows defining a margin before which we consider the token as expired. This is a configurable parameter in the django settings because the time a page takes to render is infra and deployment specific. This margin is preset to ten seconds. Requires: https://review.openstack.org/101556 Closes-Bug: 1308918 Change-Id: I0bf0d079a9dc000c1a30f0e20dcaa03b22d63e51
* | | | | | | | | | | | | | | Merge "Rename Extra Specs with Metadata in Flavors table"Jenkins2014-09-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Rename Extra Specs with Metadata in Flavors tablemariamj@us.ibm.com2014-09-241-1/+1
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'Extra Specs' column heading in the Flavors table has been renamed to 'Metadata' for consistency (for example, 'Update Metadata' form) Closes-Bug: #1371251 Change-Id: Ibeb81167553b42f299613359dad49a9bff05fc48
* | | | | | | | | | | | | | | Merge "Move datepicker language js inclusion outside compress"Jenkins2014-09-261-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Move datepicker language js inclusion outside compressDoug Fish2014-09-241-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The datapicker language support works by including a different js file based on the language of the user. This will not work if the js is included at compress time becuase only 1 language can be included. Additionally cleaning up the logic in case the locale isn't set (as is the case at compression time) to prevent an improper path from being build. Change-Id: I953dde0e7ee4a876376faf28c6f0bb859a3dc6b6 Closes-Bug: #1373430
* | | | | | | | | | | | | | | | Merge "Fix policy check for subnet operation"Jenkins2014-09-262-21/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix policy check for subnet operationAkihiro Motoki2014-09-232-21/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Neutron policy has a policy to check a network owning a given subnet, so we need a special handling for neutron subnet. Change-Id: I0b31d8565228e37be06bb85c199ee31d3fe7f5cc Closes-Bug: #1324634
View Lorry Controller Status