update README, enable scheduler filters and moved default values to metadata to clean up if blocks
diff --git a/README.rst b/README.rst
index 25b8042..55e0904 100644
--- a/README.rst
+++ b/README.rst
@@ -1,6 +1,6 @@
==============
-OpenStack Nova
+OpenStack Nova
==============
OpenStack Nova provides a cloud computing fabric controller, supporting a wide variety of virtualization technologies, including KVM, Xen, LXC, VMware, and more. In addition to its native API, it includes compatibility with the commonly encountered Amazon EC2 and S3 APIs.
@@ -20,6 +20,8 @@
version: juno
enabled: true
security_group: true
+ cpu_allocation_ratio: 8.0
+ ram_allocation_ratio: 1.0
bind:
public_address: 10.0.0.122
public_name: openstack.domain.com
diff --git a/metadata/service/control/cluster.yml b/metadata/service/control/cluster.yml
index 1627813..03e1900 100644
--- a/metadata/service/control/cluster.yml
+++ b/metadata/service/control/cluster.yml
@@ -14,6 +14,9 @@
vncproxy_url: ${_param:nova_vncproxy_url}
security_group: false
dhcp_domain: novalocal
+ scheduler_default_filters: "DifferentHostFilter,RetryFilter,AvailabilityZoneFilter,RamFilter,CoreFilter,DiskFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter"
+ cpu_allocation_ratio: 16.0
+ ram_allocation_ratio: 1.5
logging:
- engine: syslog
facility: local0
diff --git a/metadata/service/control/single.yml b/metadata/service/control/single.yml
index 696faaa..f2ec608 100644
--- a/metadata/service/control/single.yml
+++ b/metadata/service/control/single.yml
@@ -14,6 +14,9 @@
security_group: false
vncproxy_url: ${_param:nova_vncproxy_url}
dhcp_domain: novalocal
+ scheduler_default_filters: "DifferentHostFilter,RetryFilter,AvailabilityZoneFilter,RamFilter,CoreFilter,DiskFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter"
+ cpu_allocation_ratio: 16.0
+ ram_allocation_ratio: 1.5
logging:
- engine: syslog
facility: local0
diff --git a/nova/files/kilo/nova-controller.conf.Debian b/nova/files/kilo/nova-controller.conf.Debian
index 7ea4972..0344d99 100644
--- a/nova/files/kilo/nova-controller.conf.Debian
+++ b/nova/files/kilo/nova-controller.conf.Debian
@@ -20,6 +20,9 @@
libvirt_inject_partition = -1
vif_plugging_is_fatal = False
vif_plugging_timeout = 0
+cpu_allocation_ratio = {{ controller.cpu_allocation_ratio }}
+ram_allocation_ratio = {{ controller.ram_allocation_ratio }}
+scheduler_default_filters = {{ controller.scheduler_default_filters }}
{%- if controller.cpu_allocation_ratio is defined %}
cpu_allocation_ratio = {{ controller.cpu_allocation_ratio }}
diff --git a/nova/files/liberty/nova-controller.conf.Debian b/nova/files/liberty/nova-controller.conf.Debian
index 309b4ab..84eaa4f 100644
--- a/nova/files/liberty/nova-controller.conf.Debian
+++ b/nova/files/liberty/nova-controller.conf.Debian
@@ -19,6 +19,9 @@
libvirt_inject_partition = -1
vif_plugging_is_fatal = False
vif_plugging_timeout = 0
+cpu_allocation_ratio = {{ controller.cpu_allocation_ratio }}
+ram_allocation_ratio = {{ controller.ram_allocation_ratio }}
+scheduler_default_filters = {{ controller.scheduler_default_filters }}
allow_resize_to_same_host = True