Commit Graph

12497 Commits

Author SHA1 Message Date
Jenkins d52ea46f55 Merge "Fix _poll_bandwidth_usage if no network on vif" 2012-02-06 23:59:01 +00:00
Jason Kölker 9b1b65a439 Fix _poll_bandwidth_usage if no network on vif
Bugfix for lp901819

Move DB lookups out of the virt layer for bw usage.
Migrate to storing the mac address in the table.
Only lookup network label when sending usage events.
Attempt to use info_cache for label lookup before
    punting to rpc call.

Change-Id: Iffb4bc220804be7d5fe26d6416b90cd747b72753
2012-02-06 17:03:07 -06:00
Jenkins 7249610633 Merge "Fix nova.virt.firewall debugging message to use UUID" 2012-02-06 22:57:09 +00:00
Jenkins 47b65b718d Merge "Fix debugging log message to print instance UUID" 2012-02-06 22:46:58 +00:00
Johannes Erdfelt 0cbc395007 Fix nova.virt.firewall debugging message to use UUID
Otherwise it prints the repr() of the instance, which isn't very useful:

2012-02-06 21:34:23,163 DEBUG nova.virt.firewall [-] Filters added to the instance: <nova.db.sqlalchemy.models.Instance object at 0x5deb5d0> from (pid=11219) prepare_instance_filter /usr/lib/python2.6/dist-packages/nova/virt/firewall.py:138

Change-Id: I22cd20dbed44527f0d2ece2a788c9465f7f77ee4
2012-02-06 22:43:47 +00:00
Jenkins ab857f574d Merge "Adds flags for href prefixes" 2012-02-06 22:37:24 +00:00
Jenkins b2a49decb6 Merge "mkfs takes vfat, not fat32." 2012-02-06 22:24:01 +00:00
Johannes Erdfelt 59471a6cad Fix debugging log message to print instance UUID
It was printing the repr() of the instance, which is not very useful:

2012-02-06 21:34:12,111 DEBUG nova [-] Starting snapshot for VM <nova.db.sqlalchemy.models.Instance object at 0x5fbb2d0> from (pid=11219) _create_snapshot /usr/lib/python2.6/dist-packages/nova/virt/xenapi/vmops.py:653

Change-Id: I86f5e0803576fdad741e7df8d62c77bda8c95b31
2012-02-06 22:19:48 +00:00
Jenkins 33e008a2da Merge "bug 927507: fix quantum manager get_port_by_attachment" 2012-02-06 22:12:40 +00:00
Josh Kearney 25c69947da mkfs takes vfat, not fat32.
Change-Id: I2619eea5371be430fe303db21a1958b84c5d0f0e
2012-02-06 16:12:14 -06:00
Jenkins f6d09254bb Merge "Add initiator to initialize_connection" 2012-02-06 17:29:45 +00:00
Jenkins a86f921d49 Merge "Allows nova to read files as root" 2012-02-06 17:18:45 +00:00
Jenkins b3572e21a6 Merge "Pass partition into libvirt file injection" 2012-02-06 17:09:16 +00:00
Justin Santa Barbara b5bd5188b5 Pass partition into libvirt file injection
Fixes bug 927289

Change-Id: If290cea2fe509e7e972ff614bddf958edcc621f6
2012-02-06 08:45:37 -08:00
Armando Migliaccio 659342feff bug 924266: connection_type and firewall_driver flags mismatch
If connection_type is None, the default firewall driver should not
be nova.virt.libvirt.firewall.IptablesFirewallDriver; it should
either be None or the base one.

If this fix gets through, devstack needs to be fixed accordingly.
See review below for details.

https://review.openstack.org/#change,3576

Change-Id: I58dabc50be2d5cdcd509b2ac89a5bd0f78251bd0
2012-02-06 15:46:52 +00:00
Jenkins 24b934f7f0 Merge "Don't write a dns directive if there are no dns records in /etc/network/interfaces" 2012-02-06 14:47:03 +00:00
Jenkins 97c10efe75 Merge "Rename inst in _create_image, and pass instance to log msgs." 2012-02-06 14:31:06 +00:00
Jenkins 18f00405dc Merge "Fix broken flag in test_imagecache" 2012-02-06 14:21:33 +00:00
Dan Wendlandt 38682667c5 bug 927507: fix quantum manager get_port_by_attachment
- makes query efficient by using Quantum API filters (new in API v1.1)
- fixes correctness issue where we did not handle case where network
did not exist in quantum (note: this was masked by a quantum bug that
will be fixed once this change is into nova).

Also included a few other minor things in this patchset:
1) make get_instance_nw_info use network label from DB, which is already
available, rather than calling out to quantum just to get the name.
2) quantum manager was not properly cleaning up VIFs in the nova db.  This fixes that.
3) set 'bridge' in nw_info dictionary to the empty string, to clearly indicate that this value is ignored by Quantum Manager.

Change-Id: Ia1cbb5232f8ce373b605979902f88d7528d3e456
2012-02-06 01:32:12 -08:00
Michael Still e01d5a2a23 Fix broken flag in test_imagecache
Removing the duplicate instances_path flag in
nova/virt/libvirt in https://review.openstack.org/#change,3759
broke the imagecache unit tests.

Change-Id: I8fed15bd22d88a7796e1f98981c3ad87358a244a
2012-02-06 16:37:02 +11:00
Justin Santa Barbara 1a32aad3a6 Don't write a dns directive if there are no dns records in /etc/network/interfaces
Change-Id: I26e22f37f91bf242aa573c91b26b2304fdd25751
2012-02-05 19:51:17 -08:00
OpenStack Jenkins cb78efa52c Imported Translations from Launchpad
Change-Id: I6031c17fd161f4ac39dfa11f27d45846208df5f9
2012-02-05 23:01:18 +00:00
Vishvananda Ishaya 94d8553201 Add initiator to initialize_connection
Some volumes need to know the name of the initiator that will be
connecting to the iscsi volume.  This adds a call down to the hypervisor
driver to get the ip and the initiator name for the vm before calling
initialize connection. This connection is passed down to the volume
driver so that it can be used to authenticate when the hypervisor
tries to connect to the volume.

 * Adds initiator initialize_connection
 * Makes a call to driver to get initiator name and ip address
 * Gets initiator from openiscsi for libvirt
 * Gets initiator from config for xenapi
 * Add tests for the driver calls
 * Fixes bug 924461

Change-Id: I5b6a2dd84560c7f7b447571e0abf0993e5512ca0
2012-02-04 11:35:16 -08:00
Vishvananda Ishaya 65e233133e Allows nova to read files as root
* Adds a rootwrap filter to limit readable files
 * Adds a utils method to read a file as root
 * adds tests to verify the additions work

Change-Id: Ic1ffb6f72f9b73795d5f39fac719842e6bdf16dd
2012-02-03 16:49:42 -08:00
Soren Hansen e9fd01e58b Re-run nova-manage under sudo if unable to read conffile
Having to manually sudo to the nova user to make things work is
tedious. Make it so that if we can't read the conffile, we just
re-exec under sudo.

Fixes bug 805695

Change-Id: I322cece80ca757c69147fb3f8474ad137d9bff82
2012-02-04 00:26:26 +01:00
Jenkins 61c434baa7 Merge "Provides flag override for vlan interface" 2012-02-03 23:09:13 +00:00
Philip Knouff 91b3d687d7 Adds flags for href prefixes
bug #924090

Change-Id: I66358b3f526a5d356e11281ee32ce80e7b74d474
2012-02-03 17:34:08 -05:00
Mark Washenberger f0a1148589 X_USER is deprecated in favor of X_USER_ID
Addressed bug 926372

Eventually, we should stop supporting X_USER because it is *supposed* to
be the user's login name rather than their id. But this change preserves
the old behavior for stability.

For more info checkout keystone/middleware/auth_token.py in the keystone
project.

Change-Id: Ie837e73f9a592a903af71a426e202f8b6a9ac581
2012-02-03 17:31:35 -05:00
Jenkins cd0df1e8b0 Merge "Move cfg to nova.openstack.common" 2012-02-03 19:50:45 +00:00
Jenkins 30c363beeb Merge "Remove duplicate instances_path option" 2012-02-03 19:38:00 +00:00
Mark McLoughlin 9871c5f963 Move cfg to nova.openstack.common
Move it here so that it can be kept in sync with openstack-common using
the new update.py script for code in openstack-common's incubation area.

See here for more details:

  http://wiki.openstack.org/CommonLibrary#Incubation

Note: this commit just moves the existing code in Nova with no other
changes. A subsequent commit will sync it with latest openstack-common
so that it is easier see the new changes.

Change-Id: If88d678b1b9bad3d37117de7f7159d7fea8ab4c8
2012-02-03 19:21:54 +00:00
Ziad Sawalha 6b532096f6 Use Keystone Extension Syntax for EC2 Creds
- Syntax is OS-KSEC2:ec2Credentials (not ec2Credentials)
- adds to fix for bug 917408
- Syntax also requires a call to /tokens instead of /ec2tokens
- Changes are compatible (old syntax supported)
- Warning will be issued to log if URL syntax is old

Change-Id: I5ff9d1643122de2f383517e60f15852720c54490
2012-02-03 11:21:27 -08:00
Mark McLoughlin 9dadca1f3a Remove duplicate instances_path option
Change-Id: Ic5b4fd0fd5360ca6f9d029e8eb4d751a3ea36262
2012-02-03 19:16:26 +00:00
Jenkins fd7d07536b Merge "Delete swap VDI if not used" 2012-02-03 18:51:28 +00:00
Jenkins 75d6a844a2 Merge "Raise ApiError in response to InstanceTypeNotFound" 2012-02-03 18:37:28 +00:00
Johannes Erdfelt 8f50396158 Delete swap VDI if not used
Fixes bug 889196

Change-Id: I08f4484310c5a35e62ca761193790a464ad15ac9
2012-02-03 18:04:26 +00:00
Jenkins 8ac1b20fef Merge "Fix bug #924093" 2012-02-03 17:15:36 +00:00
Jenkins 10e18bce63 Merge "Make sure tenant_id is populated" 2012-02-03 16:54:23 +00:00
Maru Newby 07d74aa916 Raise ApiError in response to InstanceTypeNotFound
* Updates methods in nova.compute.instance_types to catch
   InstanceTypeNotFound exceptions and re-raise them as ApiError.
   - Previously, the methods in instance_types were raising ApiError in
     response to DBError, but the underlying db calls have since been
     updated to detect empty results and throw more specific exceptions.
 * Updates get_instance_type_by_flavor_id to not try to catch DBError,
   as the underlying db call only ever raises FlavorNotFound.
   get_instance_type_by_flavor_id should not raise ApiError, as callers
   expect the FlavorNotFound exception and know how to handle it.
 * Fixes bug 872618

Change-Id: I8652f04889adb448017afd253ecdcc840fbb660f
2012-02-03 00:15:12 -08:00
Michael Still f7e5328e13 Rename inst in _create_image, and pass instance to log msgs.
This renames inst in _create_image to the more consistant name
"instance". It also passes the instance through log messages in this
method, and removes the instance name from the translatable text
for the corresponding log messages.

Change-Id: I9a085198d3bea5d073f4297cc57c84dc7fcb0349
2012-02-03 18:37:49 +11:00
Jenkins 54d7fdc0c8 Merge "blueprint nova-image-cache-management phase1" 2012-02-03 06:10:30 +00:00
masumotok 55a9930c7a Fix bug #924093
Change-Id: If014165a630c3722eae26bf2aa1e5d137f145815
2012-02-03 13:38:04 +09:00
Brad Hall e79e36a3e7 Make sure tenant_id is populated
Change-Id: Ic2dfa06d3a3bef2f63e011629a870903b5990363
2012-02-02 17:30:58 -08:00
Mandell Degerness d9b6338f1c Fix for bug 883310
Don't throw exception when flavor has vcpus=0 or memory_mb=0

Change-Id: I6f12cf06a569b491f537880afe37f2cf516be2d2
2012-02-03 00:01:29 +00:00
Jenkins 03adfdbc1c Merge "Make crypto use absolute imports" 2012-02-02 23:40:58 +00:00
Jenkins bcdce942de Merge "Remove duplicate logging_debug_format option" 2012-02-02 23:31:15 +00:00
Vishvananda Ishaya b863fb3744 Make crypto use absolute imports
* Fixes bug 925792
 * Cleans up some extra imports as well

Change-Id: Ibea2411f552747e074c8d2e96468e3b09bf9c9c9
2012-02-02 15:29:07 -08:00
Jenkins 1a88c64535 Merge "fix stale libvirt images on download failure. Bug 801412" 2012-02-02 23:14:31 +00:00
Mark McLoughlin dc6c739845 Remove duplicate logging_debug_format option
Looks like it was accidentally added by commit 605c22b18.

Change-Id: Ibfd16e47cea3fa549f3a6064076361098ba76dd6
2012-02-02 23:11:51 +00:00
Jenkins 38399a7333 Merge "Add comments to injected keys and network config" 2012-02-02 23:06:19 +00:00