Minor fixes for nova.conf and naming mismatch in glance.

perfectsine · perfectsine · commit dd73ca263e9f · 2014-01-23T15:56:06.000-06:00
diff --git a/attributes/glance.rb b/attributes/glance.rb
@@ -36,8 +36,8 @@
 default['glance']['images'] = {
   'CirrOS 0.3.0 i386' => 'https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-i386-disk.img',
   'CirrOS 0.3.0 x86_64' => 'https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img',
-  'Fedora 19 (Cloud) i386' => 'http://download.fedoraproject.org/pub/fedora/linux/releases/19/Images/x86_64/Fedora-x86_64-19-20130627-sda.qcow2',
-  'Fedora 19 (Cloud) x86_64' => 'http://download.fedoraproject.org/pub/fedora/linux/releases/19/Images/i386/Fedora-i386-19-20130627-sda.qcow2',
+  'Fedora 19 (Cloud) x86_64' => 'http://download.fedoraproject.org/pub/fedora/linux/releases/19/Images/x86_64/Fedora-x86_64-19-20130627-sda.qcow2',
+  'Fedora 19 (Cloud) i386' => 'http://download.fedoraproject.org/pub/fedora/linux/releases/19/Images/i386/Fedora-i386-19-20130627-sda.qcow2',
   'Ubuntu 12.04 Server (Cloud) amd64' => 'http://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-amd64-disk1.img',
   'Ubuntu 12.04 Server (Cloud) i386' => 'http://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-i386-disk1.img',
   'Ubuntu 12.10 Server (Cloud) amd64' => 'http://cloud-images.ubuntu.com/quantal/current/quantal-server-cloudimg-amd64-disk1.img',
diff --git a/templates/default/nova/nova.conf.erb b/templates/default/nova/nova.conf.erb
@@ -15,9 +15,6 @@ connection=mysql://<%= node['nova']['db']['username'] %>:<%= node['nova']['db'][
 ##### RABBITMQ #####
 <%= render "nova/partials/rabbit.erb" %>
 
-##### COMPUTE #####
-<%= render "nova/partials/compute.erb" %>
-
 ##### NEUTRON #####
 <%= render "nova/partials/neutron.erb" %>
 
@@ -28,4 +25,7 @@ connection=mysql://<%= node['nova']['db']['username'] %>:<%= node['nova']['db'][
 <%= render "nova/partials/glance.erb" %>
 
 ##### NOVNC #####
-<%= render "nova/partials/vncproxy.erb" %>
+<%= render "nova/partials/vncproxy.erb" %>
+
+##### COMPUTE #####
+<%= render "nova/partials/compute.erb" %>
diff --git a/templates/default/nova/partials/compute.erb b/templates/default/nova/partials/compute.erb
@@ -7,6 +7,7 @@ rabbit_password=guest
 
 # Scheduling #
 scheduler_driver=nova.scheduler.filter_scheduler.FilterScheduler
+scheduler_default_filters=CoreFilter
 
 # WSGI #
 api_paste_config=/etc/nova/api-paste.ini
@@ -39,18 +40,20 @@ ec2_workers=<%= node['nova']['config']['ec2_workers'] %>
 # S3 #
 s3_host=<%= node[:controller][:public_ip] %>
 
-# Hyper-V #
-libvirt_use_virtio_for_bridges=True
-libvirt_inject_password=True
-libvirt_inject_partition=1
-connection_type=libvirt
-
 # Nova Compute #
 running_deleted_instance_action=<%= node['nova']['config']['running_deleted_instance_action'] %>
 force_config_drive=<%= node['nova']['config']['force_config_drive'] %>
 cpu_allocation_ratio=<%= node['nova']['config']['cpu_allocation_ratio'] %>
 ram_allocation_ratio=<%= node['nova']['config']['ram_allocation_ratio'] %>
 disk_allocation_ratio=<%= node['nova']['config']['disk_allocation_ratio'] %>
 
+# Libvirt #
+[libvirt]
+libvirt_use_virtio_for_bridges=True
+libvirt_inject_password=True
+libvirt_inject_partition=1
+connection_type=libvirt
+
 # Nova Conductor #
+[conductor]
 workers=<%= node['nova']['config']['conductor_workers'] %>
diff --git a/templates/default/nova/partials/rabbit.erb b/templates/default/nova/partials/rabbit.erb
@@ -1,4 +1,3 @@
 # Nova Scheduler #
 rabbit_host=<%= node[:rabbitmq][:private_ip] %>
 rabbit_password=<%= node['nova']['config']['rabbit_password'] %>
-scheduler_driver=nova.scheduler.filter_scheduler.FilterScheduler
