diff options
| author | Brian Lamar <brian.lamar@rackspace.com> | 2011-05-19 16:25:57 -0400 |
|---|---|---|
| committer | Brian Lamar <brian.lamar@rackspace.com> | 2011-05-19 16:25:57 -0400 |
| commit | 99bab1b99bf4388a0dba89300c4fb71095681276 (patch) | |
| tree | edd18204412a53477247b3a5909a6348db654972 | |
| parent | afa8bb371a3e9f3e770107acabd341334b8d4847 (diff) | |
| download | nova-99bab1b99bf4388a0dba89300c4fb71095681276.tar.gz nova-99bab1b99bf4388a0dba89300c4fb71095681276.tar.xz nova-99bab1b99bf4388a0dba89300c4fb71095681276.zip | |
Moved back templates and fixed pep8 issue. Template move was due to breaking packaging with template moves. That will need to happen in a later merge.
| -rw-r--r-- | MANIFEST.in | 3 | ||||
| -rw-r--r-- | nova/virt/cpuinfo.xml.template (renamed from nova/virt/libvirt/cpuinfo.xml.template) | 0 | ||||
| -rw-r--r-- | nova/virt/libvirt.xml.template (renamed from nova/virt/libvirt/libvirt.xml.template) | 0 | ||||
| -rw-r--r-- | nova/virt/libvirt/connection.py | 5 | ||||
| -rw-r--r-- | nova/virt/libvirt/netutils.py | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/MANIFEST.in b/MANIFEST.in index fc4492754..e7a6e7da4 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -24,7 +24,8 @@ include nova/console/xvp.conf.template include nova/db/sqlalchemy/migrate_repo/migrate.cfg include nova/db/sqlalchemy/migrate_repo/README include nova/virt/interfaces.template -include nova/virt/libvirt/*.template +include nova/virt/libvirt*.xml.template +include nova/virt/cpuinfo.xml.template include nova/tests/CA/ include nova/tests/CA/cacert.pem include nova/tests/CA/private/ diff --git a/nova/virt/libvirt/cpuinfo.xml.template b/nova/virt/cpuinfo.xml.template index 48842b29d..48842b29d 100644 --- a/nova/virt/libvirt/cpuinfo.xml.template +++ b/nova/virt/cpuinfo.xml.template diff --git a/nova/virt/libvirt/libvirt.xml.template b/nova/virt/libvirt.xml.template index de2497a76..de2497a76 100644 --- a/nova/virt/libvirt/libvirt.xml.template +++ b/nova/virt/libvirt.xml.template diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py index 87ba3fec3..94a703954 100644 --- a/nova/virt/libvirt/connection.py +++ b/nova/virt/libvirt/connection.py @@ -57,7 +57,6 @@ from nova import context from nova import db from nova import exception from nova import flags -from nova import ipv6 from nova import log as logging from nova import utils from nova import vnc @@ -85,7 +84,7 @@ flags.DEFINE_string('rescue_image_id', 'ami-rescue', 'Rescue ami image') flags.DEFINE_string('rescue_kernel_id', 'aki-rescue', 'Rescue aki image') flags.DEFINE_string('rescue_ramdisk_id', 'ari-rescue', 'Rescue ari image') flags.DEFINE_string('libvirt_xml_template', - utils.abspath('virt/libvirt/libvirt.xml.template'), + utils.abspath('virt/libvirt.xml.template'), 'Libvirt XML Template') flags.DEFINE_string('libvirt_type', 'kvm', @@ -108,7 +107,7 @@ flags.DEFINE_string('firewall_driver', 'nova.virt.libvirt.firewall.IptablesFirewallDriver', 'Firewall driver (defaults to iptables)') flags.DEFINE_string('cpuinfo_xml_template', - utils.abspath('virt/libvirt/cpuinfo.xml.template'), + utils.abspath('virt/cpuinfo.xml.template'), 'CpuInfo XML Template (Used only live migration now)') flags.DEFINE_string('live_migration_uri', "qemu+tcp://%s/system", diff --git a/nova/virt/libvirt/netutils.py b/nova/virt/libvirt/netutils.py index 9225d8929..4d596078a 100644 --- a/nova/virt/libvirt/netutils.py +++ b/nova/virt/libvirt/netutils.py @@ -26,6 +26,7 @@ import IPy from nova import context from nova import db from nova import flags +from nova import ipv6 from nova import utils @@ -46,6 +47,7 @@ def get_ip_version(cidr): net = IPy.IP(cidr) return int(net.version()) + def get_network_info(instance): # TODO(adiantum) If we will keep this function # we should cache network_info @@ -93,5 +95,3 @@ def get_network_info(instance): network_info.append((network, mapping)) return network_info - - |