summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge "Allow OVA upload for images" into stable/queensZuul2018-05-157-228/+188
|\
| * Allow OVA upload for imagesGuillaume Le Blanc2018-05-157-228/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #1641383 was not fixed for REST API call. The two implementation of create_image_metadata are merged into api/glance.py. There were minor differences in field naming and handling (min_ vs minimum_, is_public vs public vs visibility). This commit normalizes them to simplify the logic. Closes-Bug: #1757136 Change-Id: I41e9d94345151bc4473d704cdc040ed77870ce45 (cherry picked from commit e3626260313c87aba6d9579c81f8dac415cc7235)
* | Merge "Improve mocking in REST API tests (test_glance)" into stable/queensZuul2018-05-151-100/+106
|\ \ | |/
| * Improve mocking in REST API tests (test_glance)Akihiro Motoki2018-05-151-100/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current REST API tests have a lot of rooms to be improved like: - mocking the whole module of the API wrapper --- [Note on a backport to queens] This is a preparation of a backport proposed in [1]. mock usage of api.rest.test_glance was improved in Rocky and the test backported in [1] assumes the improved version of the test. This is a test improvement which does not touch the main code, so it is a safe backport. The signature of create_mocks was changed in [2], so the arguments of create_mocks in this backport are adjusted to Queens version. [1] https://review.openstack.org/#/c/566267/ [2] https://review.openstack.org/#/c/545472/ Change-Id: Id573d97c467fe8457f60baff089d60c18345395e Partial-Bug: #1752917 (cherry picked from commit dfa68461ea9d6599809d623bccbf2b5ddb9faec9)
* | Merge "Drop horizon-openstack-tox-py35dj20 from queens jobs" into stable/queensZuul2018-05-081-8/+0
|\ \ | |/ |/|
| * Drop horizon-openstack-tox-py35dj20 from queens jobsAkihiro Motoki2018-04-121-8/+0
| | | | | | | | | | | | | | Django 2.0 support was deferred to Rocky, so there is no reason to run py35dj20 for queens changes. Change-Id: Ie4f1894b6e15d833aab9ec605f760e4b0f46253a
* | Merge "Imported Translations from Zanata" into stable/queens13.0.1Zuul2018-04-303-8/+19
|\ \
| * | Imported Translations from ZanataOpenStack Proposal Bot2018-04-263-8/+19
| | | | | | | | | | | | | | | | | | | | | For more information about this automatic import see: https://docs.openstack.org/i18n/latest/reviewing-translation-import.html Change-Id: I0447c1e746a442bca22ac9274dc6f1e1430a799d
* | | Merge "Replace all mentions of get_identity_providers with ↵Zuul2018-04-303-3/+3
|\ \ \ | |/ / |/| | | | | get_identity_provider" into stable/queens
| * | Replace all mentions of get_identity_providers with get_identity_providerRadomir Dopieralski2018-04-253-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | There was a typo in keystone's policy files, and it has been fixed in Keystone already, we should also fix it to match. Change-Id: I41e4381765f3bfc5988ca235e6cbeb6d1ba62fc2 Closes-bug: #1703369 (cherry picked from commit 93bb571888a1bff4fa1e110356dbf2cb9fb4ee52)
* | | Merge "Fix wrong setting name for SHOW_KEYSTONE_V2_RC" into stable/queensZuul2018-04-251-1/+1
|\ \ \
| * | | Fix wrong setting name for SHOW_KEYSTONE_V2_RCAdrian Turjak2018-04-201-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user links patch didn't use the same setting variable name in context_processors.py, this fixes that. Closes-Bug: #1757112 Change-Id: Ie0e516d82c2c1cdc1c343075393cdf9c336f8e5f (cherry picked from commit f588b4ee2e73c754a7565928c47552e159a1666d)
* | | Merge "Use items per page setting on Angular tables" into stable/queensZuul2018-04-2510-9/+117
|\ \ \ | |/ / |/| |
| * | Use items per page setting on Angular tablesCindy Lu2018-04-1010-9/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make NG table get page size from the items per page setting instead of a fixed number which is 20. The styling of the pagination control is the same as the django table with the prev and next links. Co-Authored-By: Liuqing Jing <jing.liuqing@99cloud.net> Co-Authored-By: Vladislav Kuzmin <vkuzmin@mirantis.com> Change-Id: Ie5307e335ca3251a342d370e7277fe16067f7949 Closes-Bug: #1647677 (cherry picked from commit c58e5b8779b296d57e30bd547e46322b3d1e8d99)
* | | Imported Translations from ZanataOpenStack Proposal Bot2018-04-171-0/+93
| |/ |/| | | | | | | | | | | For more information about this automatic import see: https://docs.openstack.org/i18n/latest/reviewing-translation-import.html Change-Id: If72fffb2a8fa8f4ac6bece53f7f13a3712552c49
* | Fix pep8 errorsAkihiro Motoki2018-04-1110-40/+58
|/ | | | | | | | | | | | | | | | | | | | | | | | | Recent pep8 upgrade and corresponding pycodestyle update break horizon pep8 job due to the new rules. This commit fixes the following new errors: - E226 missing whitespace around arithmetic operator - E241 multiple spaces after ',' - E731 do not assign a lambda expression, use a def The following errors are added to the ignore list as there are many errors: - E402 module level import not at top of file - W503 line break before binary operator Conflicts: openstack_dashboard/dashboards/admin/aggregates/tests.py openstack_dashboard/dashboards/admin/instances/tests.py openstack_dashboard/dashboards/admin/routers/tests.py openstack_dashboard/dashboards/project/networks/tests.py openstack_dashboard/dashboards/project/routers/tests.py Change-Id: I3478b0684175d2604bbcc1d89cbfca298b97f1e1 (cherry picked from commit f545272f129b8310fa44084cef0e23770c20f9dc)
* Merge "Fix Angular errors in openstack_auth" into stable/queensZuul2018-03-285-13/+22
|\
| * Fix Angular errors in openstack_authShu Muto2018-03-175-13/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Angular errors on login page are caused by loading ngdetails view. Although registration of URL for ngdetails is executed on top level of Horizon, ngdetails view is not needed to be loaded in login page, i.e. openstack_auth side. To fix this issue, this patch moves registration of URL for ngdetails into openstack_dashboard side. Change-Id: Ib039417b4e666c2341f17ac05fd7723bc758816c Closes-Bug: #1754133 Closes-Bug: #1753557 (cherry picked from commit f494c6f2d475bfc936b78fda7ce11ed4d46c7224)
* | Imported Translations from ZanataOpenStack Proposal Bot2018-03-233-8/+17
| | | | | | | | | | | | | | For more information about this automatic import see: https://docs.openstack.org/i18n/latest/reviewing-translation-import.html Change-Id: I25e50de90e293350aaf80962342c76f6a0a59f2d
* | Add a warning to user: Unable to remove availability zone from host aggregateDongjx2018-03-141-2/+9
|/ | | | | | | | | | Because the nova API does not allow to set aggregates an empty availability_zone which has availability_zone at first. Add a warning to notice users to reduce confusion Change-Id: I5864c58751ec5f182f30feb302a95923948ad2ad Closes-Bug: #1644051 (cherry picked from commit 7cb2355dffa32951cc9f283dd5dcb5ff1836190f)
* Add same launch instance error handling as image to instanceBeth Elwell2018-03-091-1/+2
| | | | | | | | | | | | | Previously, when launching an instance with an instance snapshot rather than with an image, the error handling was not as pleasant. I.e. the volume size was not automatically set to the minimum size and the error message would only appear after attempting to launch an instance. This is a small patch that addresses this and makes the user experience more friendly. Change-Id: Ib694f66c74e90ee2e15201673de953c08cf10122 Closes-bug: #1752360 (cherry picked from commit 3233de8f0d13ad9e0223da9f1cf895aa30a6177e)
* Imported Translations from ZanataOpenStack Proposal Bot2018-03-0145-152/+152
| | | | | | | For more information about this automatic import see: https://docs.openstack.org/i18n/latest/reviewing-translation-import.html Change-Id: I41e2bd536e44629601c8618b154552e9fa079484
* Imported Translations from ZanataOpenStack Proposal Bot2018-02-263-12/+31
| | | | | | | For more information about this automatic import see: https://docs.openstack.org/i18n/latest/reviewing-translation-import.html Change-Id: Id96c0706b79ca9ae12093088fd28da091d170834
* Imported Translations from ZanataOpenStack Proposal Bot2018-02-223-8/+39
| | | | | | | For more information about this automatic import see: https://docs.openstack.org/i18n/latest/reviewing-translation-import.html Change-Id: Ic4f41dd06da9aaea61fc7f24cc694ca98b5f728e
* Imported Translations from ZanataOpenStack Proposal Bot2018-02-213-17/+147
| | | | | | | For more information about this automatic import see: https://docs.openstack.org/i18n/latest/reviewing-translation-import.html Change-Id: I81364e61ba69a03dcce9d9e49ddca5be7fbb1919
* Imported Translations from Zanata13.0.0.0rc213.0.0OpenStack Proposal Bot2018-02-201-7/+15
| | | | | | | For more information about this automatic import see: https://docs.openstack.org/i18n/latest/reviewing-translation-import.html Change-Id: I76287466b53e5d6cafaf6d7b350a6503b240efa3
* Imported Translations from ZanataOpenStack Proposal Bot2018-02-191-4/+69
| | | | | | | For more information about this automatic import see: https://docs.openstack.org/i18n/latest/reviewing-translation-import.html Change-Id: I628317ef842f9da066d5d7a52d48b082697d721d
* Merge "Move test template to more proper directory" into stable/queensZuul2018-02-151-0/+0
|\
| * Move test template to more proper directoryShu Muto2018-02-141-0/+0
| | | | | | | | | | | | | | | | The template for testing ngdetails view is remaining in old directory, so this patch moves it to more proper directory. Change-Id: I321779ae115c462cf095cc7697fe8a3959f3d288 (cherry picked from commit f2bff1370f236d4f9c5ed9acc3bca9cfea316d44)
* | Merge "Update UPPER_CONSTRAINTS_FILE for stable/queens" into stable/queensZuul2018-02-141-1/+1
|\ \
| * | Update UPPER_CONSTRAINTS_FILE for stable/queensOpenStack Release Bot2018-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new stable upper-constraints file is only available after the openstack/requirements repository is branched. This will happen around the RC1 timeframe. Recheck and merge this change once the requirements repository has been branched. The CI system will work with this patch before the requirements repository is branched because zuul configues the job to run with a local copy of the file and defaults to the master branch. However, accepting the patch will break the test configuration on developers' local systems, so please wait until after the requirements repository is branched to merge the patch. Change-Id: I90a6ca356f7271793963d9a19e789502b2a6c493
* | | Imported Translations from ZanataOpenStack Proposal Bot2018-02-146-21/+132
| | | | | | | | | | | | | | | | | | | | | For more information about this automatic import see: https://docs.openstack.org/i18n/latest/reviewing-translation-import.html Change-Id: Iad2b2be515e249e60d4ea95a504a2e80ad13692d
* | | Merge "Fix collectstatic in case of theme customization" into stable/queensZuul2018-02-141-3/+5
|\ \ \ | |_|/ |/| |
| * | Fix collectstatic in case of theme customizationRadomir Dopieralski2018-02-111-3/+5
| |/ | | | | | | | | | | | | | | | | When doing theme customization with templates collectstatic failes with a traceback Change-Id: I0fdb80ddde1f73b657d445c75b55636d6f2e8d88 Closes-bug: #1744239 (cherry picked from commit dc0bce63a03e37e9f3f181930ba6d6b7c8b1346e)
* | Imported Translations from ZanataOpenStack Proposal Bot2018-02-131-2/+83
| | | | | | | | | | | | | | For more information about this automatic import see: https://docs.openstack.org/i18n/latest/reviewing-translation-import.html Change-Id: I2853210d553ad6dca6457da26d4d63d227b6065e
* | Imported Translations from ZanataOpenStack Proposal Bot2018-02-1214-24514/+144
|/ | | | | | | For more information about this automatic import see: https://docs.openstack.org/i18n/latest/reviewing-translation-import.html Change-Id: I11b75a6874232d6ef744f48495b5f10b2fb7ace3
* Update .gitreview for stable/queensOpenStack Release Bot2018-02-091-0/+1
| | | | Change-Id: I7018cb82caa5b6ec5e3b12ace8bc33f17371e8f8
* Merge "Network topology "Graph" tab always shows nothing"13.0.0.0rc1Zuul2018-02-081-6/+7
|\
| * Network topology "Graph" tab always shows nothingAmeed Ashour2018-02-081-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Network topology "Graph" tab always says "There are no networks, routers, or connected instances to display." This happens after a fix for bug 1661350 (commit f35eaa2d13fc5aff31b9a83dc729cc20b91fc611) was merged. The problem with that in checking the length of object. So always will be equal undefined, also check the object before getting filled. Closes-Bug: #1747196 Change-Id: I72dd8d2b472677411635f58309c780a8d602ffe3
* | Imported Translations from ZanataOpenStack Proposal Bot2018-02-0812-53/+457
| | | | | | | | | | | | | | For more information about this automatic import see: https://docs.openstack.org/i18n/latest/reviewing-translation-import.html Change-Id: I20b7fdb3df2d998ba9b3f14ff9b22deb602c3870
* | Merge "Remove empty test file"Zuul2018-02-071-0/+0
|\ \
| * | Remove empty test fileIvan Kolodyazhny2018-02-071-0/+0
| | | | | | | | | | | | | | | | | | | | | I don't know why we still have this. Even in Pike in django_openstack_auth models.py file is empty and was created with initial commit. Change-Id: Id7910c39b28356b68b71c17591a385418578319c
* | | Merge "relnote: clearly mention django-openstack-auth needs uninstall"Zuul2018-02-071-2/+2
|\ \ \
| * | | relnote: clearly mention django-openstack-auth needs uninstallAkihiro Motoki2018-02-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before upgrading horizon, django-openstack-auth needs to be uninstalled. Otherwise, openstack_auth python module will be maintained by both django-openstack-auth and horizon python package and this potentially brings confusion. blueprint merge-openstack-auth Change-Id: Iedf9b6087e35caf4f196780e94247554b360dd0e
* | | | Imported Translations from ZanataOpenStack Proposal Bot2018-02-079-47/+631
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For more information about this automatic import see: https://docs.openstack.org/i18n/latest/reviewing-translation-import.html Change-Id: I283149a60384dba6b58889c72fd3b773088397cf
* | | | Merge "Use nova os-services to retrieve host list"Zuul2018-02-077-167/+124
|\ \ \ \
| * | | | Use nova os-services to retrieve host listAkihiro Motoki2018-02-017-167/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | novaclient version 10 has dropped the support for novaclient.v2.hosts. os-aggregates and migrateLive APIs expects host from os-services, so this commit retrieves host list from os-services API. Change-Id: I5ec007ab1f244ca8caee1eb7b5d4262ac6c32171 Closes-Bug: #1745502
* | | | | Merge "Sync nova policy"Zuul2018-02-077-143/+73
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Sync nova policyAkihiro Motoki2018-02-057-143/+73
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on nova commit 32c8ac6b7dfe4ca0c211cbce7c5a67d88558126f The new file was generated by oslopolicy-sample-generator: oslopolicy-sample-generator --namespace nova --format json nova uses policy-in-code now, so there is a lot of differences. Sorted version diff is http://paste.openstack.org/show/628742/ All policies with "@" have been dropped. Dropped policies used in horizon are: os_compute_api:os-certificates:create os_compute_api:os-scheduler-hints:discoverable os_compute_api:os-server-groups:discoverable [discoverable] "discoverable" policies are related to nova API extensions but the API extension mechanism has gone in Nova Queens, so these policies now make no sense in Nova. In Horizon side, we are still use a bit older API version to launch instance, so it seems some fallback policies are needed and they are added as conf/nova_policy.d. [os_compute_api:os-certificates:create] No corresponding policy is found, so the related policy check is dropped. EC2 API is provided as a separate project from nova. I guess this is the reason the policy was dropped. DownloadEC2 action referred to it, but we already checks EC2 service is available so I believe the policy can be dropped safely. [openstack_dashboard.test.unit.api.rest.test_policy] Unit tests are updated according to the nova policy change. Note that test_rule_alone previously succeeded because it used non-existing policy and fallbacked to 'default' rule. The rule is changed to a policy for non-admin user. Change-Id: I68f91bc29b20a4ecd613fc75735d38b9a48162ee
* | | | Merge "Imported Translations from Zanata"Zuul2018-02-063-15/+380
|\ \ \ \
View Lorry Controller Status