summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Return 409 on creating/importing same name keypairRohan Rhishikesh Kanade2013-04-017-17/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Removed the DB look up on creating and importing a keypair. * Added unique constraint on user_id and name columns of key_pairs table. Fixes LP: #1086333. Change-Id: I2fd4697f9269d2be13bd977e65ba4ca4a27b9ac6
* | | | | | Merge "Accepts aws-sdk-java timestamp format"Jenkins2013-04-012-4/+33
|\ \ \ \ \ \
| * | | | | | Accepts aws-sdk-java timestamp formatMotoKen2013-03-292-4/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The aws-sdk-java timestamp format is "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'" which contains millisecond representation. However, the current implementation does not accept this kind of format. References: https://github.com/aws/aws-sdk-java/blob/master/src/main/java/com/amazonaws/auth/QueryStringSigner.java#L173 Adds ability to parse this format in ec2utils.is_ec2_timestamp_expired. Fixes bug 1156445. Change-Id: I389ff8b9c6c91b699538b889add264d66dbb8131
* | | | | | | Merge "Use Cluster reference to reduce SDK calls"Jenkins2013-04-013-17/+15
|\ \ \ \ \ \ \
| * | | | | | | Use Cluster reference to reduce SDK callsdivakar-padiyar-nandavar2013-03-283-17/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The vmware compute driver retrieves the cluster reference for every spawn and volume operation. The solution is to retrieve the reference once from the __init__() of vmwareapi/driver.py and reuse the same in other methods. This will reduce the number of VI SDK calls made. Fix for bug 1130222 Change-Id: I2179733ee4ab1b2aea919de0ad4c10631cf005ea
* | | | | | | | Merge "Remove gettext.install() from nova/__init__.py"Jenkins2013-04-0120-8/+42
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove gettext.install() from nova/__init__.pyMark McLoughlin2013-04-0120-8/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The gettext.install() function installs a builtin _() function which translates a string in the translation domain supplied to the install() function. If gettext.install() is called multiple times, it's the last call to the function which wins and the last supplied translation domain which is used e.g. >>> import os >>> os.environ['LANG'] = 'ja.UTF-8' >>> import gettext >>> gettext.install('keystone', unicode=1, localedir='/opt/stack/keystone/keystone/locale') >>> print _('Invalid syslog facility') 無効な syslog ファシリティ >>> gettext.install('nova', unicode=1, localedir='/opt/stack/nova/nova/locale') >>> print _('Invalid syslog facility') Invalid syslog facility Usually this function is called early on in a toplevel script and we assume that no other code will call it and override the installed _(). However, in Nova, we have taken a shortcut to avoid having to call it explicitly from each script and instead call it from nova/__init__.py. This shortcut would be perfectly fine if we were absolutely sure that nova modules would never be imported from another program. It's probably quite incorrect for a program to use nova code (indeed, if we wanted to support this, Nova code shouldn't use the default _() function) but nevertheless there are some corner cases where it happens. For example, the keystoneclient auth_token middleware tries to import cfg from nova.openstack.common and this in turn causes gettext.install('nova') in other projects like glance or quantum. To avoid any doubt here, let's just rip out the shortcut and always call gettext.install() from the top-level script. Change-Id: If4125d6bcbde63df95de129ac5c83b4a6d6f130a
* | | | | | | | | Merge "Return proper error message when network conflicts"Jenkins2013-04-013-18/+28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Return proper error message when network conflictsHaiwei Xu2013-04-013-18/+28
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1158075 When creating a network which is already existing, we got an internal server error which can't show the error reason. This patch returns conflict error(HTTP 409) instead of internal server error(HTTP 500), so that users can know the error reason from the error message. Change-Id: I9e39a7152e37756b34b1c8d77de057012743f0f7
* | | | | | | | | Merge "Ensure only pickle-able objects live in metadata"Jenkins2013-04-012-3/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Ensure only pickle-able objects live in metadataStanislaw Pitucha2013-03-282-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conductor api has been added to InstanceMetadata object, but it cannot be serialised. This breaks storing metadata in memcache, because the information needs to be passed through pickle. Since the field was not used outside of the constructor, it can be removed to fix the problem. Also add a test that pickles a sample InstanceMetadata to catch similar failures in the future. Fixes bug 1160900 Change-Id: I7e8cef5a131290eaa1402d48295026bcac6baff6
* | | | | | | | | | Merge "Better iptables DROP removal."Jenkins2013-04-011-29/+39
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Better iptables DROP removal.Michael Still2013-03-311-29/+39
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the introduction of configurable iptables DROP rules in nova-network, we need to cleanup possibly more than one drop rule, depending on what DROP action was in place when the rule was created. This patch handles this for the simple case where the drop action has just been configured. More complicated scenarios will need to be handled manually. Change-Id: I660607ff6e23ca545f96e536d1084d972bc7c7a2
* | | | | | | | | | Merge "Add missing unit tests for FlavorActionController"Jenkins2013-04-011-0/+36
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add missing unit tests for FlavorActionControllerOleg Bondarev2013-03-291-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1115575 Change-Id: I81740bd30d03fd3c5d9b1dcc7f73e1b7a2b757c7
* | | | | | | | | | | Merge "Convert host value from unicode to a string."Jenkins2013-04-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Convert host value from unicode to a string.Dan Florea2013-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The memcached API expects string format, not unicode. Convert the host value to a string before creating the cache_key and passing it to memcached. Fixes: bug #1158958 Change-Id: I26e86b7fb61b4b3380a14686bd2faa9f58017999
* | | | | | | | | | | | Merge "Fix migrating instance to the same host."Jenkins2013-04-012-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix migrating instance to the same host.Guan Qiang2013-03-282-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In current code logic, Migration to the same host is allowed which is meaningless. In the patch, a Conf flag 'allow_migrate_to_same_host' is added and set to false as default. When 'allow_migrate_to_same_host' is false, the current instance host will be added into filter property 'ignore_hosts' to avoid migrating instance to the same host. Fixes: bug #1160268 Change-Id: I5ac0391cf468310a89fb6d8a8f5120c5654cb4ff
* | | | | | | | | | | | | Merge "Switch nova-baremetal-deploy-helper to use sfdisk."Jenkins2013-04-012-13/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Switch nova-baremetal-deploy-helper to use sfdisk.Chris Krelle2013-03-262-13/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes make_partitions function to use sfdisk instead of fdisk. Also added logging of cmd, stdout, and stderr should command fail. Fixes Bug 1088652 Change-Id: Ia2711a5450900c95598253f2a7b02e7c3e83a3d8 Authored-by: Chris Krelle <nobodycam@gmail.com>
* | | | | | | | | | | | | | Merge "Sync latest gettextutils from oslo-incubator"Jenkins2013-04-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Sync latest gettextutils from oslo-incubatorMark McLoughlin2013-04-011-1/+1
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #1076285 Ensure translations for strings under nova.openstack.common are translated using the 'nova' translation domain rather than the non-existent 'openstack-common' translation domain. Change-Id: I6aee3061cbffd3bf940f1881e8540cd996d0b12a
* | | | | | | | | | | | | Merge "Show quota 'in_use' and 'reserved' info"Jenkins2013-04-012-15/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Show quota 'in_use' and 'reserved' infogengjh2013-03-282-15/+34
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need show all the quotas related info, including 'in_use' and 'reserved'--not just the limit--when executing 'nova-manage project quota'. Fix bug 1160752 Change-Id: I25e10e58c6af705e2189550ad762e6f39bca342e
* | | | | | | | | | | | | Merge "Query quantum once for instance's security groups"Jenkins2013-04-014-24/+82
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Query quantum once for instance's security groupsAaron Rosen2013-03-294-24/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the method get_instance_security_group_bindings() which returns all the instance_id's and security groups for a given tenant. This method is then used to avoid querying quantum for it's security groups when using GET /v2/<project_id>/servers/detail. Fixes bug 1161518 Change-Id: Ia28d5573c264f0316ab9fb257ca8e7ae35679883
* | | | | | | | | | | | | | Merge "Delete tests.baremetal.util.new_bm_deployment()"Jenkins2013-04-011-14/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Delete tests.baremetal.util.new_bm_deployment()Arata Notsu2013-04-011-14/+0
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function is not used anymore. It creates an instance of BareMetalDeployment, which was removed in c20110d1. Change-Id: I40b634f8cf0d4369f09cb61aca6f95a059e85d6d
* | | | | | | | | | | | | | Merge "improve handling of an empty dnsmasq --domain"Jenkins2013-04-012-25/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | improve handling of an empty dnsmasq --domainPádraig Brady2013-03-292-25/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently all domains passed through the dnsmasq --domain option, are single quoted. It's not fully understood how dnsmasq handles single quotes in this situation, so it's safer to just avoid the --domain option in this case. Fixes bug: 1161506 Change-Id: I8ecd996676189f53908abd48fee81132091ee820
* | | | | | | | | | | | | | Merge "Sync in matchmaker and qpid Conf changes from oslo"Jenkins2013-03-302-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Sync in matchmaker and qpid Conf changes from osloJoe Gordon2013-03-292-4/+4
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following should use integers not strings. * matchmaker_heartbeat_freq * matchmaker_heartbeat_ttl * qpid_port Fixes bug 1159889 and bug 1161679 Change-Id: I2f055929ffa48ead300d2a3efdb0ce0692a13716
* / / / / / / / / / / / / quantum security group driver nova list shows same groupAaron Rosen2013-03-293-10/+35
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using the quantum security group driver nova list shows the same security group for all instances. This patch fixes this and corrects the unit test that was hiding this bug. This also adds a unit test to check that the default security group is added to the response when not specified. Fixes bug 1162077 Change-Id: I7a10f81af1bb6c93f634dc0de27841afe0f1f0ea
* | | | | | | | | | | | Merge "Fix automatic confirmation of resizes for no-db-compute"Jenkins2013-03-296-4/+34
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix automatic confirmation of resizes for no-db-computeDan Smith2013-03-296-4/+34
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compute/api.py:confirm_resize() was still making a bunch of calls against the database that were tripping over the no-db-compute enforcement checks. Instead of trying to unwind all of the instance action, quota, etc code and divert to conductor, just farm out the entire confirm_resize() call to conductor. Fixes bug 1161402 Change-Id: I121040a3b575f5866d45cc8ef6862d67f5558715
* | | | | | | | | | | | Merge "get context from req rather than getting a new admin context"Jenkins2013-03-295-28/+28
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | get context from req rather than getting a new admin contextAaron Rosen2013-03-285-28/+28
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes the call to context.get_admin_context() and instead obtains the context from the req object. Allowing the context.auth_token to be reused. Fixes bug 1161081 Change-Id: I3b104edc2966fc3263fad824b1c4c99df832672e
* | | | | | | | | | | | Merge "Set default fixed_ip quota to unlimited."Jenkins2013-03-2925-56/+56
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Set default fixed_ip quota to unlimited.Michael Still2013-03-2925-56/+56
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DocImpact: our previous default quota of ten was poorly thought through and resulted in upgrade problems. Instead, let's have operators opt into fixed IP quotas. This change should be mentioned in release notes please. Resolves bug 1161190. Change-Id: I2f066a0129461899fe330a628cf49ee5273eaba4
* | | | | | | | | | | | Merge "'injected_files' should be base 64 encoded."Jenkins2013-03-293-7/+93
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 'injected_files' should be base 64 encoded.Brian Elliott2013-03-293-7/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an instance build needs to be rescheduled, send the original base 64 encoded injected_files parameter. bug 1161479 Change-Id: I4dad95e95cd27f7f128989daa36b3a2bbf132c73
* | | | | | | | | | | | | Merge "Imported Translations from Transifex"OpenStack Jenkins2013-03-291-174/+170
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Imported Translations from TransifexOpenStack Jenkins2013-03-291-174/+170
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I737b11916a85c9694b1f47ec89e66947cd188bb1
* | | | | | | | | | | | Merge "sync oslo db/sqlalchemy module"Jenkins2013-03-292-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | sync oslo db/sqlalchemy moduleMichael J Fork2013-03-282-2/+3
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sync oslo db/sqlalchemy module to grab "Mark sql_connection with secret flag" change. fixes bug 1160680 Change-Id: Id48419624c41eea5a0f2e130d7cdbe8a8f0a9118
* | | | | | | | | | | Merge "Fix missing punctuation in docstring"Jenkins2013-03-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix missing punctuation in docstringDan Smith2013-03-281-1/+1
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a period to the end of a docstring that was recently added and swiftly merged to fix a bug in -rc2. Change-Id: I399a72868911e03c6d69d9591ddcf7ee2d132fea
* | | | | | | | | | Merge "xenapi: fix support for iso boot"Jenkins2013-03-286-103/+350
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | xenapi: fix support for iso bootJohn Garbutt2013-03-286-103/+350
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1154731 that stated the iso support was broken. There were several issues around a vdis list without a 'root' disk. Because the ISO boot was HVM, only 0-3 devices will work, so, the devices used have been re-ordered to ensure ISOs can be read by a HVM guest without PV tools. Once PV tools are present, a HVM guest will be able to access an ephemeral or swap disk. Change-Id: I4b57f70301a4256fa975323d7964fde19e8d4508