summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Updated from global requirements2014.2.1OpenStack Proposal Bot2014-12-051-1/+1
| | | | Change-Id: I75172700283a95e1e056b8ee35688e9a83321e72
* Updated from global requirementsOpenStack Proposal Bot2014-12-031-1/+1
| | | | Change-Id: Iee5554ddc36e58163d260175964dad8b759c94ec
* Disable osprofiler by defaultLouis Taylor2014-11-284-6/+18
| | | | | | | | | | | This could cause issues when upgrading to juno, since if config files are not updated osprofiler can crash. It is disabled by default in other services, such as cinder and heat. Change-Id: Ide1be0d42e9e3640560564005b2ce1ffdf554e25 Closes-Bug: #1387320 (cherry picked from commit 090cb56ba100d53dc7c95148dde77a8a4969adfe)
* Merge "Improve error log for expired image location url" into stable/junoJenkins2014-11-272-0/+21
|\
| * Improve error log for expired image location urlankitagrawal2014-10-222-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If image is not present at the specified location while creating instance from image, then HTTPInternalServerError 500 response along with stack trace is logged on nova compute which does not help user to understand the exact cause of failure. Return HTTPNotFound error to the nova compute in case of image url got expired or image is not present at the given location to give clear indication of the cause of failure to user. Closes-Bug: #1198566 Change-Id: I9acd9112aeae8d3b3c0c3921f306e716e5808c2e (cherry picked from commit 633bec8fd45897735e1fcb9844903fe597903b21)
* | Merge "Make RequestContext use auth_token (not auth_tok)" into stable/junoJenkins2014-11-2613-86/+71
|\ \
| * | Make RequestContext use auth_token (not auth_tok)Stuart McLaren2014-11-1313-86/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RequestContext class from oslo-incubator uses 'auth_token'. Glance's RequestContext uses 'auth_tok' -- which is inconsistent. glance_store currently uses the oslo 'auth_token'. We should not assume a 1-1 mapping from the glance_store to glance, nor should we have glance_store support both 'auth_token' and 'auth_tok'. Therefore Glance should be updated to use 'auth_token'. This change was generated automatically with: $ for file in `find glance -name '*\.py' -exec grep -wl auth_tok "{}" \;` ; \ do sed --in-place 's/\<auth_tok\>/auth_token/g' $file ; done In addition, the set_auth_token function was removed. This had been used by Nova to work around the auth_tok <-> auth_token inconsistency, but was removed in mid-2012 as part of the move to python-glanceclient so is no longer needed. In conjuction with other changes this fixes image upload when using the multi-tenant Swift store. Change-Id: Ic8a5f44088990fd8f6290a5622b823f59ef365fc Partial-bug: #1385213 (cherry picked from commit cc7ae2abd5c67b5573ca609e27c79d5c4f9a528d)
* | | Merge "Swift Multi-tenant store: Pass context on upload" into stable/junoJenkins2014-11-261-1/+2
|\ \ \ | |/ /
| * | Swift Multi-tenant store: Pass context on uploadStuart McLaren2014-11-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Image upload returns an E500 as the context is not being passed to the swift client. Change-Id: I2065b7dd281bfbb513f13270a0c062fc7132f763 Partial-bug: 1385213 (cherry picked from commit 867b696d884e9db707683eecd321789843798efd)
* | | Merge "Fix for adopt glance.store library in Glance" into stable/junoJenkins2014-11-211-2/+2
|\ \ \
| * | | Fix for adopt glance.store library in Glanceankitagrawal2014-11-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The store module is removed from glance project and new glance_store module is created, but the glance project code was not updated properly for the required changes. _get_from_store and _get_size methods raises store.NotFound exception from glance_store but not caught in the glance api. Updated exception.NotFound to store.NotFound which returns 404 NotFound response to the user. Closes-Bug: #1380552 Change-Id: I068cb90f5db62443115157a027fbdefec9bd4a00 (cherry picked from commit 675a39a74faad5f7fe4eb94e1dcf7f4359ed2285)
* | | | Merge "Image not downloaded without restricted property" into stable/junoJenkins2014-11-205-2/+286
|\ \ \ \ | |_|/ / |/| | |
| * | | Image not downloaded without restricted propertyabhishekkekane2014-11-185-2/+286
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If restrict download rule is configured in policy.json, and image is added without protected property mentioned in "restricted" rule, then normal users (other than admin) are not able to download the image. Added logic in policy.py, to allow normal user to download image without restricted property. https://review.openstack.org/#/c/127923/ Above patch will fix the issue for master, but as it is too large to be back-ported to stable/juno, Nikhil recommended to push only minimal changes that fixes this issue after discussing it with the release manager. In this patch, I have copied required changes from oslo-incubator policy module from commit 33533b0d97639ed828a2fd5e874f16eb1ecfeaa4. Note: In juno release, oslo-incubator policy module was not synced with glance completely. Closes-Bug: #1387973 Change-Id: Ib85901b073c85ede7da2e9c7333426c8b8de3bb6
* | | Upgrade tests' mocks to match glance_storeFlavio Percoco2014-11-112-7/+10
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Latest glanec_store release added a new `context` keyword to some functions. This broke backwards compatibility for some of the tests in master and juno. This change adds the corresponding keyword to the mock calls. Closes-bug: #1391437 Change-Id: I5e58462e4c076b3ea56e27361eb6c3b0aafa2493 (cherry picked from commit 6b3edb2a48e3d77a623862853690bb72f31d213a)
* | Can not delete images if db deadlock occursankitagrawal2014-10-212-0/+12
|/ | | | | | | | | | | | Glance api returns 500 Internal Server Error, if db deadlock occurs in glance-registry for some reason while deleting an image. Added retry on image_destroy when db deadlock occures which will again try to delete the image from database. Closes-bug: 1378215 Change-Id: Ifad403e363daf368e846b5b6838432a7bedbe81a (cherry picked from commit dae0fa8f1071be41d5541e9a5254abea48f5ba36)
* Opening stable/junoThierry Carrez2014-10-162-1/+2
| | | | | | | Bump version to next stable release on juno branch, and set defaultbranch in .gitreview for convenience. Change-Id: I801b6e599d79f5cf6d171b27722de21687a4661a
* Merge "Fix options and their groups - etc/glance-api.conf" into proposed/juno2014.2.rc32014.2proposed/junoJenkins2014-10-151-194/+196
|\
| * Fix options and their groups - etc/glance-api.confNikhil Komawar2014-10-141-194/+196
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per the docs at [0] , some of the options should have been moved around in the etc/glance-api.conf. This patch changes the conf file to: 1. indicate new default values 2. change the group of some of the configs in order to adhere to new groups as expected by the deployer. 3. deprecated configs have been removed or replaced with new ones. [0] http://docs.openstack.org/trunk/config-reference/content/glance-conf-changes-master.html Fixes bug: 1380689 Change-Id: I5b5ab96b050b502007e6660a7a613e252404d4e8
* | Adjust authentication.rst doc to reference "identity_uri"Andy McCrae2014-10-141-7/+4
|/ | | | | | | | | | The "auth_port", "auth_host", and "auth_protocol" variables were deprecated in favour of a single "identity_uri" variable. * Adjust authentication.rst doc to reference "identity_uri" Change-Id: I48de53f21b8d767b276858ed274066015d765f0e Closes-Bug: #1361613
* Use identity_uri instead of older fragments2014.2.rc2Jamie Lennox2014-10-102-6/+2
| | | | | | | | This has been the default option in middleware for a while now and we should recommend the default options. Change-Id: Ief347c897cf15ab4101936a56404e3a378021b15 (cherry picked from commit e7110a9c6e0119b3d0c6f5cdb3b9675a82b76039)
* Prevent setting swift+config locationsStuart McLaren2014-10-103-19/+41
| | | | | | | | | | | | | | | | Forbid setting 'swift+config' locations in a similar manner to 'file' for security reasons; knowledge of the reference name should not be exploitable. Setting swift+config had been prevented when swift was the default store, this patch changes to forbid setting no matter which store is the default. As with change id I75af34145521f533dcd6f5fd7690f5a68f3b44b3 this is v1 only for now. Change-Id: I62c4980bd5c2f3dd77fc40cd007bc1067eca63a4 Closes-bug: 1334196
* Merge "Metadef schema column name is a reserved word in MySQL" into ↵Jenkins2014-10-109-36/+152
|\ | | | | | | proposed/juno
| * Metadef schema column name is a reserved word in MySQLWayne Okuma2014-10-099-36/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The metadef_properties and metadef_objects tables both have a column named schema. Unfortunately, schema is a reserved word in some relational database products, including MySQL and PostgreSQL. The metadef_properties.schema and metadef_objects.schema columns should be renamed to a non reserved word. Conflicts: glance/db/sqlalchemy/metadata.py glance/tests/unit/test_migrations.py Change-Id: I9c1b497d2b09b9282a83bd8c19c32edfa4dd159f Closes-Bug: 1378968
* | Merge "GET property which name includes resource type prefix" into proposed/junoJenkins2014-10-098-6/+113
|\ \ | |/ |/|
| * GET property which name includes resource type prefixBartosz Fic2014-10-098-6/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently GET call to API to retrieve property details ends with 404 error when property name includes resource type prefix. This patch extends show method to take filters as a parameter. If 'resource_type' is included in filters then the prefix of included resource type is removed from property name. This enables user to look for property name starting with prefix that comes from associated resource type. Change-Id: I3c4d96fbc9ce15016631017bf76089c338ac3cdc Closes-Bug: #1367564 DocImpact Co-Authored-By: Bartosz Fic <bartosz.fic@intel.com> Co-Authored-By: Pawel Koniszewski <pawel.koniszewski@intel.com>
* | Merge "Remove stale chunks when failed to update image to registry" into ↵Jenkins2014-10-091-4/+27
|\ \ | | | | | | | | | proposed/juno
| * | Remove stale chunks when failed to update image to registryZhi Yan Liu2014-10-091-4/+27
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | For image v1 api, the operation of uploading image bits to store and the operation of updating image metadata are separaed, so when the second operation failed, the image stale chunks will be leaked in store. This change added a logic to remove those chunks if an exception happenned during the step of image metadata updating. And if glance-registry could be reached still, the image status will be changed to 'killed', this followed standard glance image status transition. Closes-bug: 1254497 Change-Id: I01e13066b48a8feb1ead0de64992e7997feafdea Signed-off-by: Zhi Yan Liu <zhiyanl@cn.ibm.com>
* | Merge "g-api raises 500 error while uploading image" into proposed/junoJenkins2014-10-095-0/+73
|\ \
| * | g-api raises 500 error while uploading imageabhishekkekane2014-10-095-0/+73
| |/ | | | | | | | | | | | | | | | | | | | | | | | | If both filesystem_store_datadirs and filesystem_store_datadir parameters specified in glance-api.conf file then while creating new image 500 internal server error is raised. Caught StoreAddDisabled exception for v1 and v2 api while uploading image and raised HTTPGone exception to return HTTP 410 response to user. Closes-Bug: #1372888 Change-Id: Iccbf5b88634d3c956d41e8d8a0126648c64b34eb
* | Fix for Adopt glance.store library in GlanceRajesh Tailor2014-10-092-2/+36
|/ | | | | | | | | | | | | The store module is removed from glance project and new glance_store module is created, but the glance project code was not updated properly for the required changes. The exception (UnknownScheme) was moved to glance_store, but in glance image-create api (v1), it still refers to exception.UnknownScheme in get_store_or_400 method. Change-Id: I09e78b92d2d44a659412361b4f03b4a988714bf5 Closes-Bug: 1373454
* Update Metadefs associated with ImagePropertiesFilterTravis Tripp2014-10-091-6/+7
| | | | | | | | | | | | | | | | | From: http://docs.openstack.org/trunk/config-reference/content/section_compute-scheduler.html#imagepropertiesfilter Filters hosts based on properties defined on the instance's image. Updated descriptions to be provide better information. Added baremetal "hypervisor_type" after getting info from Nova core about what hypervisors to include. Left out "architecture" for now, because horizon fails when trying to update architecture property. Change-Id: I9195825a0ab4b89e764983da06827173a2daa23c Closes-bug: 1368965 (cherry picked from commit 236c9db4eb119dfaa6a592097b97e7b3f623a506)
* Merge "updated translations" into proposed/junoJenkins2014-10-0822-6730/+2
|\
| * updated translationsNikhil Komawar2014-10-0822-6730/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Commands run:- $ python setup.py extract_messages $ python setup.py update_catalog --no-fuzzy-matching \ --ignore-obsolete=true $ source \ ../openstack-infra/project-config/jenkins/scripts/common_translation_update.sh $ setup_loglevel_vars $ cleanup_po_files glance Change-Id: If1bdff3f7330c3eb58bd56b08299472ae3d4b552
* | Merge "Use ID for namespace generated by DB" into proposed/junoJenkins2014-10-081-46/+66
|\ \
| * | Use ID for namespace generated by DBBartosz Fic2014-10-081-46/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In current implementation ID that is used in namespace to insert data to DB is generated by built-in function - enumerate. This causes problems with loading the metadata when there are already namespaces in DB. This patch removes 'enumerate' and asks for namespace ID generated by database. Closes-Bug: #1367771 Co-Authored-By: Bartosz Fic <bartosz.fic@intel.com> Co-Authored-By: Pawel Koniszewski <pawel.koniszewski@intel.com> (cherry picked from commit 89c04904416270d3c306d430f443a7127c5fc206) Conflicts: glance/db/sqlalchemy/metadata.py Change-Id: I235c6310077526cafb898ac007c3601b4d66c9fe
* | | Merge "Metadef Property and Object schema columns should use ↵Jenkins2014-10-088-23/+19
|\ \ \ | |/ / | | | | | | JSONEncodedDict" into proposed/juno
| * | Metadef Property and Object schema columns should use JSONEncodedDictWayne Okuma2014-10-088-23/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MetadefProperty and MetadefObject ORM classes currently specify the JSON schema columns as type Text. It is preferred to use the JSONEncodedDict Type Decorator instead. This fix also includes necessary code changes to remove JSON encoding/decoding that was previously done in other layers. Fixes for unit tests involving the schema columns are also included. Closes-Bug: 1368479 Conflicts: glance/db/__init__.py glance/db/sqlalchemy/models_metadef.py Change-Id: I2c574210f8d62c77a438afab83ff80f3e5bd2fe7 (cherry picked from commit 824d9620b0b90483baf45981d2cb328855943e06)
* | | Merge "Updated from global requirements" into proposed/junoJenkins2014-10-081-3/+3
|\ \ \ | |_|/ |/| |
| * | Updated from global requirementsOpenStack Proposal Bot2014-10-061-3/+3
| | | | | | | | | | | | Change-Id: I32c8167913b9412120d1256ffddf9117f765551f
* | | Merge "Add missing metadefs for shutdown behavior" into proposed/junoJenkins2014-10-081-0/+21
|\ \ \ | | |/ | |/|
| * | Add missing metadefs for shutdown behaviorTravis Tripp2014-10-081-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following Nova patch adds support for graceful shutdown of a guest VM and allows setting timeout properties on images. The properties should be updated in the Metadata Definitions catalog. https://review.openstack.org/#/c/68942/ Change-Id: I58145d9d0114b3932b63263ea123c4662146d14b Closes-bug: 1368036 (cherry picked from commit 5fcb3aa2e35e9af17cb8be9e24c6613626036f2b)
* | | Update driver metadata definitions to JunoTravis Tripp2014-10-072-14/+38
|/ / | | | | | | | | | | | | | | | | | | | | | | vmware and libvirt support different hw_vif_model settings. This patch updates them so that each namespace can specify the models they support. vmware api is updated with the vmware_disktype Change-Id: Iec5901097c9621a052a930b99d5cbe7872d4f3ff Closes-bug: 1370767 (cherry picked from commit ebafdbeef6420d0fcc4922f245956096ca9e50b3)
* | Merge "Mark custom properties in image schema as non-base" into proposed/junoJenkins2014-10-072-1/+21
|\ \
| * | Mark custom properties in image schema as non-baseKamil Rykowski2014-10-072-1/+21
| |/ | | | | | | | | | | | | | | | | | | | | Currently it is impossible to determine if given image schema property is base or custom one and knowledge of that can be handy in some situations. Proposed change appends to every custom property special key which determiness that it is not a base property. Change-Id: I49255255df311036d516768afc55475c1f9aad47 Partial-Bug: #1371559 (cherry picked from commit 94c05cbdbb3a78b3df4df8d522555f34d2f0a166)
* | Merge "Include Metadata Defs Concepts in Dev Docs" into proposed/junoJenkins2014-10-072-1/+191
|\ \
| * | Include Metadata Defs Concepts in Dev DocsTravis Tripp2014-10-072-1/+191
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The http://docs.openstack.org/developer/glance/ site currently doesn't include the Juno Metadata Definitions concepts. This patch adds an overview of the concepts to this site. This provides a synopis of the concepts in: https://github.com/openstack/glance-specs/blob/master/specs/juno/metadata-schema-catalog.rst DocImpact Closes-Bug: 1367432 Related-Bug: 1367908 Related-Bug: 1363615 Related-Bug: 1366286 Related-Bug: 1363383 Change-Id: Iad4d388cbbf2f63fa243d04d35032de0cb0bc1b4 (cherry picked from commit 0aab5e271667990afb1a2522c7c9c61fa7211e0b)
* | Merge "Specify the MetadefNamespace.namespace column is not nullable" into ↵Jenkins2014-10-071-1/+1
|\ \ | | | | | | | | | proposed/juno
| * | Specify the MetadefNamespace.namespace column is not nullableWayne Okuma2014-10-071-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | The metadef_namespaces table definition indicates the namespace column as not accepting nulls. The related MetadefNamespace ORM class should also indicate that the namespace column does not accept nulls with "nullable=False" in the column definition. Change-Id: I681747b6579a2284f23bf154889a61c639b0616d Closes-Bug: 1367619 (cherry picked from commit 10e858d57be5e04615f390b3060c8aeadaeed954)
* | Merge "Make compute-trust.json compatible with TrustFilter" into proposed/junoJenkins2014-10-071-4/+9
|\ \
| * | Make compute-trust.json compatible with TrustFilterPawel Koniszewski2014-10-071-4/+9
| |/ | | | | | | | | | | | | | | | | | | | | | | Current properties inside compute-trust.json does not match with how TrustFilter in nova works. JSON provides True/False boolean values but TrustFilter expects trusted/untrusted/unknown string values. This patch repairs compute-trust.json to be compatible with TrustFilter. Change-Id: I26965a549daf9340621b0f18a1b845b39bac4bd8 Closes-Bug: #1369581 (cherry picked from commit 39e90f29d93f991d95092de5f93a239be1b3ca3b)
View Lorry Controller Status