summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge "Remove orphaned db method instance_test_and_set"Jenkins2013-04-171-9/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Remove orphaned db method instance_test_and_setHans Lindgren2013-04-151-9/+0
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 86544fad81f95b74407a76bea8b081f490e2832f removed the only use of this method together with the sqlalchemy implementation of it but forgot to remove it from db.api. Change-Id: I751f99ee64cdeab56f1f3fd9f846157f241804a2
* | | | | | | | | | | Merge "Added comments to quantum api client"Jenkins2013-04-171-4/+32
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Added comments to quantum api clientVic Howard2013-04-161-4/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a few comments for bug 1020184 Change-Id: I6bc59b5b8b57685aae461e5b1111d8dbd168123d
* | | | | | | | | | | | Merge "Fix bug in os-availability-zone extension."Jenkins2013-04-172-12/+31
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix bug in os-availability-zone extension.Andrea Rosa2013-04-112-12/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1167956. The call to get the list of availability zones (GET V2/os-availability-zone) doesn't hide internal availability zone if all services in that zone are disabled. Change-Id: I2c49ad68c2ee5ddea0536dfa770f649fbb392b63
* | | | | | | | | | | | Merge "xenapi: Make _connect_volume exc handler eventlet safe"Jenkins2013-04-161-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | xenapi: Make _connect_volume exc handler eventlet safeRick Harris2013-04-101-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `forget_sr` blocks and so clears the exception state causing the subsequent raise to try to raise `None`, which fails. Fixes bug 1167515 Change-Id: I18562c7389b152a6490d352c5a8d36934288f47d
* | | | | | | | | | | | Merge "Imported Translations from Transifex"OpenStack Jenkins2013-04-1522-2162/+2135
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Imported Translations from TransifexOpenStack Jenkins2013-04-1522-2162/+2135
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I01693e36efa67457c5d5963a430d590bd2903908
* | | | | | | | | | | | Merge "Add NOVA_LOCALEDIR env variable"Jenkins2013-04-153-7/+28
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Add NOVA_LOCALEDIR env variableMark McLoughlin2013-04-103-7/+28
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of fixing bug #995287 Syncs these two commits from oslo-incubator: Support overriding oslo localedir too Add a gettextutils.install() helper function to get a new gettextutils.install() function which allows the default localedir to be overwritten via an environment variable. Note that gettextutils.install() must be called before any other nova modules are imported since some modules attempt to translate strings at import time (e.g. the 'message' attributes on classes in nova.exception). This is broken and inefficient, but fixing it involves adding something like spinx's l_() function and would be very invaisve. Also, note that calling gettextutils.install() in nova.cmd.__init__ means that no program which uses a different translation domain should ever import any of the modules under nova.cmd. Change-Id: I86562b3a65d371673bb21f7179eecc7602bc0775
* | | | | | | | | | | Merge "Make sure confirm_resize finishes before setting vm_state to ACTIVE"Jenkins2013-04-142-4/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Make sure confirm_resize finishes before setting vm_state to ACTIVEHans Lindgren2013-04-132-4/+5
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting it to ACTIVE to early will allow new resize or whatever operations to start before the current confirm has finished which might result in all sorts of conflicts. Resolves bug 1161529 where an intermittent failure in a tempest test happens because a confirm operation conflicts with a later resize carried out on the same instance. As the new resize starts to move around instance disks, the still not finished confirm operation might fail at recalculating total disk usage due to a missing disk. Other possible conflicts might be due to system_metadata and/or quota not being up-to-date at the moment the instance becomes ACTIVE. Change-Id: I079da4e271469739504fa87e23149d03652d98f0
* | | | | | | | | | Merge "Make compute/manager use conductor for unrescue()"Jenkins2013-04-146-4/+27
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make compute/manager use conductor for unrescue()Dan Smith2013-04-126-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The compute_api.unrescue() call makes direct database queries, which means it can't be called directly from compute manager. This patch adds support in conductor for proxying this request and makes compute manager utilize it. Fixes bug 1167619 Change-Id: I158c64cabdfe436462f5669047fb930819a13c50
* | | | | | | | | | | Imported Translations from TransifexOpenStack Jenkins2013-04-1422-4247/+4274
| |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1b7a045d7b9bd96200c4508043cdd18c8a96fa5d
* | | | | | | | | | Merge "Add an extension to show the mac address of a ip in server(s)"Jenkins2013-04-1235-16/+796
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Add an extension to show the mac address of a ip in server(s)Zhi Yan Liu2013-04-1235-16/+796
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This extension adds the OS-EXT-IPS-MAC:mac_addr param so that users can associate the mac address to the ip of the server in one API call. Implement bp: os-ext-ips-mac-api-extension DocImpact Change-Id: I01d0b3aa804b5218853a4bb568c85e31b87d04e4 Signed-off-by: Zhi Yan Liu <zhiyanl@cn.ibm.com>
* | | | | | | | | Merge "Define LOG globally in baremetal_deploy_helper"Jenkins2013-04-121-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Define LOG globally in baremetal_deploy_helperArata Notsu2013-04-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since LOG = getLogger() has been moved from the global scope to the function scope (main), the rest of the module could not find LOG. This patch makes LOG global again. Fixes bug 1165262 Change-Id: I2607802dcbed64135f75011a02ebce95519e4ea1
* | | | | | | | | | Merge "Allow for the power state interval to be configured."Jenkins2013-04-121-1/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Allow for the power state interval to be configured.Joshua Harlow2013-04-111-1/+6
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The power state interval right now is hard coded to 600 seconds. In order to allow deployers to change this timing (and determine) the side-effects of that change it is useful to allow this value to be configured instead of static. DocImpact Change-Id: I9baf34f9b132dc20fcc096f86fa0e5794fc06312
* | | | | | | | | | Cleans up orphan compute_nodes not cleaned up by compute managerDavid Peraza2013-04-125-45/+120
| |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1161193 Orphan compute_node records can cause the scheduler to pick compute nodes that are not handled by driver anymore. This can happen if you rename your hypervisor_hostname or in a multi-node support where driver does not support a node anymore for whatever reason (hardare failure for example). Also, removing resource tracker logic to delete nodes since resource trackers built in compute manager will never accept nodes not reported by driver Change-Id: I742d2e81ec0592d952ee5736aa8dce1e5598ef80
* | | | | | | | | Merge "Imported Translations from Transifex"OpenStack Jenkins2013-04-1222-3173/+3125
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Imported Translations from TransifexOpenStack Jenkins2013-04-1222-3173/+3125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I662a2904bc8abff0ec4f24edae6194f04cf95738
* | | | | | | | | | Merge "Remove unnecessary db call in scheduler driver live-migration code"Jenkins2013-04-122-13/+9
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Remove unnecessary db call in scheduler driver live-migration codeHans Lindgren2013-04-112-13/+9
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the scheduler selects a destination host for live-migration, a db call is made to get instance_type info for the instance. To avoid the db call, this should instead call instance_types.extract_instance_type on the instance. Resolves bug 1167811. Change-Id: I2025fdf1d34e70158360ff71e8545c8e3bc6bc80
* | | | | | | | | Merge "Remove multi scheduler."Jenkins2013-04-112-155/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove multi scheduler.Russell Bryant2013-04-102-155/+0
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes the multi scheduler. It doesn't provide any value. The only code that exists here is for passing through requests to the compute scheduler. There is nothing that uses the 'default' scheduler. The only case where this code could have been useful is if it was patched out of tree. At that point, it seems easier to just provide your own scheduler driver that does what you want instead of trying to patch this one, IMO. DocImpact: The multi scheduler no longer exists. Change-Id: I30902d1ce0aa5baef6693dc4a3b1057cccb27841
* | | | | | | | | Merge "baremetal: Change node api related to prov_mac_address"Jenkins2013-04-1127-22/+158
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | baremetal: Change node api related to prov_mac_addressArata Notsu2013-04-1127-22/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now prov_mac_address is going to be dropped from bm_nodes table. This patch adjust api to the change. A user is expected to create a node without specifying prov_mac_address, then add an interface having the address to the node. However, for compatibility, a user still can specify prov_mac_address when create a node. In this case, an interface having prov_mac_address is automatically added to the node. In response body of create, index and show, "prov_mac_address" field no longer exists since they are showed as a member of "interfaces" fileld. DocImpact Change-Id: I6653829364b0a641442d45e766493180d6f2a880
* | | | | | | | | Merge "Remove "undefined name" pyflake errors"Jenkins2013-04-116-20/+31
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Remove "undefined name" pyflake errorsStanislaw Pitucha2013-04-106-20/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A number of places tried to use undefined names. This included one powervm test which turned out to not check anything at all (used fake implementation of tested method) and needed to be moved. Make sure that this class of errors causes run_pep8 failure in the future. Change-Id: I82ccb63bbc6f6d2b20ecb7f06b2fc22f8f034a33
* | | | | | | | | Merge "Fix issues with check_instance_shared_storage."Jenkins2013-04-113-2/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix issues with check_instance_shared_storage.Russell Bryant2013-04-103-2/+8
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 52f6981aa35e27c48587ad2320891db8364edd02 added a new method to the compute rpc API. A test was not added to compute/test_rpcapi.py for this. I noticed when I hit a bug in a patch I'm working on that would have been caught by this test. The addition to the client side also missed adding the version number that was required for this method to be supported. Since the versioning wasn't set up fully, this patch goes ahead and adds the instance to the data being sent, as well. It's more consistent, even if not used (yet). Fix bug 1167356. Change-Id: I46055a666fe3cf4a923002f11d22c3b6a6d020e2
* | | | | | | | | Merge "Imported Translations from Transifex"OpenStack Jenkins2013-04-1122-48608/+4695
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Imported Translations from TransifexOpenStack Jenkins2013-04-1122-48608/+4695
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7a592da6e1bc7f2c494fa991b8ddbc1ca838ebef
* | | | | | | | | | Don't join metadata twice in instance_get_all()Brian Elliott2013-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2952243b093cda3d397f239ebe0db19246443a00
* | | | | | | | | | Merge "Optimize some of compute/manager's periodic tasks' DB queries"Jenkins2013-04-113-20/+44
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Optimize some of compute/manager's periodic tasks' DB queriesDan Smith2013-04-103-20/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of these tasks do not need to fetch instances with a full complement of metadata items. Make them say "no thanks" to the DB API to reduce the amount of work that needs to be done. Note some refactoring was done in the _get_instance_nw_info() method to pull this information if it ended up being necessary. The cases where this would happen are error-cleanup scenarios, and thus taking the extra hit in that case is an overall win for not having to do it all the time. Related to bug 1164737 Change-Id: Ic7d6290c0b7edf84cbf8bdc64e29f206619f97e5
* | | | | | | | | | Merge "Don't hide stacktraces for unexpected errors in rescue"Jenkins2013-04-102-14/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't hide stacktraces for unexpected errors in rescueJoe Gordon2013-04-102-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent rescue commands from hiding stacktraces for unexpected errors. Before this the wrap_errors function would catch unexpected errors and hide them, with a generic HTTPInternalServerError without any stacktrace. Change-Id: I80e0ae8257117a3e5a4c946b38870aad0e58cc12
* | | | | | | | | | | Merge "Optimize some of the periodic task database queries in n-cpu"Jenkins2013-04-103-4/+11
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Optimize some of the periodic task database queries in n-cpuDan Smith2013-04-103-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are a few trivial periodic tasks that can benefit from telling the DB API (via conductor) not to fetch metadata items. This patch makes those changes Related to bug 1164737 Change-Id: I8e2730d3ed74bd7e0a0217647316c1cf492f22f3
* | | | | | | | | | | Merge "Change DB API instance functions for selective metadata fetching"Jenkins2013-04-106-35/+55
|\| | | | | | | | | |
| * | | | | | | | | | Change DB API instance functions for selective metadata fetchingDan Smith2013-04-106-35/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the DB API for instance_get_all() variants able to take a columns_to_join parameter like the base instance_get_all() function, which provides control over whether we go to the trouble of pulling the metadata out of the database before we return the instances. Related to bug 1164737 Change-Id: Ie7c012e2e12bb91ef4294cdc90d828af255b67c5
* | | | | | | | | | | Merge "Replace metadata joins with another query"Jenkins2013-04-103-29/+144
|\| | | | | | | | | |
| * | | | | | | | | | Replace metadata joins with another queryDan Smith2013-04-103-29/+144
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now, we always join metadata and system_metadata when we query for instances. This inflates the number of rows returned by a factor of ten at a minimum, and over 30 in some situations. This patch avoids the direct join of these tables in favor of a "manual join" which performs additional queries to fill the needed data. Latency may be increased, but with the gain of a potentially significant amount of reduction in data transfer. This also provides the ability for the queries which utilize it to selectively decide whether either or both of these additional fills are performed, paving the way for future high-level optimizations. Related to bug 1164737 Change-Id: I0610fb16ccce2ee95c318589c8abcc30613a3fe9
* | | | | | | | | | Merge "set timeout for paramiko ssh connection"Jenkins2013-04-102-1/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |