summaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-devtools/python/python-nova/nova.conf
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2014-09-03 01:08:14 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2014-09-03 01:08:14 -0400
commit0881d9805118707ece89be147612d02a27e3201b (patch)
treeb4dbfa68c0ca243637ca4c292ff066867319c177 /meta-openstack/recipes-devtools/python/python-nova/nova.conf
parentf3c2d6637bfc0839214b68dcf36fc5cfb64c2cbc (diff)
downloadmeta-cloud-services-0881d9805118707ece89be147612d02a27e3201b.tar.gz
nova: update to juno configuration requirements
To boot a nested guest in juno, we need to relocate the virtualization type config setting into the [libvirt] section. With this, we can sucessfully launch a guest. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-nova/nova.conf')
-rw-r--r--meta-openstack/recipes-devtools/python/python-nova/nova.conf8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova.conf b/meta-openstack/recipes-devtools/python/python-nova/nova.conf
index fbaaa78..59a6b52 100644
--- a/meta-openstack/recipes-devtools/python/python-nova/nova.conf
+++ b/meta-openstack/recipes-devtools/python/python-nova/nova.conf
@@ -2,8 +2,6 @@
2# firewall_driver = nova.virt.libvirt.firewall.IptablesFirewallDriver 2# firewall_driver = nova.virt.libvirt.firewall.IptablesFirewallDriver
3firewall_driver = nova.virt.firewall.NoopFirewallDriver 3firewall_driver = nova.virt.firewall.NoopFirewallDriver
4compute_driver = libvirt.LibvirtDriver 4compute_driver = libvirt.LibvirtDriver
5libvirt_type = kvm
6libvirt_cpu_mode = none
7default_floating_pool = public 5default_floating_pool = public
8fixed_range = 6fixed_range =
9force_dhcp_release = True 7force_dhcp_release = True
@@ -21,7 +19,6 @@ my_ip = %CONTROLLER_IP%
21glance_host = %CONTROLLER_IP% 19glance_host = %CONTROLLER_IP%
22lock_path=/var/lock/nova/ 20lock_path=/var/lock/nova/
23state_path=/var/run/nova/ 21state_path=/var/run/nova/
24libvirt_images_type = %LIBVIRT_IMAGES_TYPE%
25 22
26#VNC 23#VNC
27vnc_enabled = True 24vnc_enabled = True
@@ -96,4 +93,7 @@ admin_tenant_name = %SERVICE_TENANT_NAME%
96admin_user = %SERVICE_USER% 93admin_user = %SERVICE_USER%
97admin_password = %SERVICE_PASSWORD% 94admin_password = %SERVICE_PASSWORD%
98 95
99 96[libvirt]
97virt_type = kvm
98libvirt_cpu_mode = none
99libvirt_images_type = %LIBVIRT_IMAGES_TYPE%