diff --git a/README.rst b/README.rst
index 5bd2abc..152d9a7 100644
--- a/README.rst
+++ b/README.rst
@@ -22,6 +22,7 @@
         security_group: true
         cpu_allocation_ratio: 8.0
         ram_allocation_ratio: 1.0
+        disk_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 7bb8d31..f23aada 100644
--- a/metadata/service/control/cluster.yml
+++ b/metadata/service/control/cluster.yml
@@ -17,6 +17,7 @@
       scheduler_default_filters: "DifferentHostFilter,RetryFilter,AvailabilityZoneFilter,RamFilter,CoreFilter,DiskFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter"
       cpu_allocation_ratio: 16.0
       ram_allocation_ratio: 1.5
+      disk_allocation_ratio: 1.0
       logging:
       - engine: syslog
         facility: local0
diff --git a/metadata/service/control/single.yml b/metadata/service/control/single.yml
index a153e31..1f45b14 100644
--- a/metadata/service/control/single.yml
+++ b/metadata/service/control/single.yml
@@ -17,6 +17,7 @@
       scheduler_default_filters: "DifferentHostFilter,RetryFilter,AvailabilityZoneFilter,RamFilter,CoreFilter,DiskFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter"
       cpu_allocation_ratio: 16.0
       ram_allocation_ratio: 1.5
+      disk_allocation_ratio: 1.0
       logging:
       - engine: syslog
         facility: local0
diff --git a/nova/files/kilo/nova-controller.conf.Debian b/nova/files/kilo/nova-controller.conf.Debian
index 2e5d154..c509951 100644
--- a/nova/files/kilo/nova-controller.conf.Debian
+++ b/nova/files/kilo/nova-controller.conf.Debian
@@ -22,6 +22,7 @@
 vif_plugging_timeout = 0
 cpu_allocation_ratio = {{ controller.cpu_allocation_ratio }}
 ram_allocation_ratio = {{ controller.ram_allocation_ratio }}
+disk_allocation_ratio = {{ controller.disk_allocation_ratio }}
 scheduler_default_filters = {{ controller.scheduler_default_filters }}
 
 allow_resize_to_same_host = True
diff --git a/nova/files/liberty/nova-controller.conf.Debian b/nova/files/liberty/nova-controller.conf.Debian
index 1781cf1..d4b57e6 100644
--- a/nova/files/liberty/nova-controller.conf.Debian
+++ b/nova/files/liberty/nova-controller.conf.Debian
@@ -21,6 +21,7 @@
 vif_plugging_timeout = 0
 cpu_allocation_ratio = {{ controller.cpu_allocation_ratio }}
 ram_allocation_ratio = {{ controller.ram_allocation_ratio }}
+disk_allocation_ratio = {{ controller.disk_allocation_ratio }}
 scheduler_default_filters = {{ controller.scheduler_default_filters }}
 
 allow_resize_to_same_host = True
diff --git a/nova/meta/sphinx.yml b/nova/meta/sphinx.yml
index 29b6251..56b7a3a 100644
--- a/nova/meta/sphinx.yml
+++ b/nova/meta/sphinx.yml
@@ -81,11 +81,14 @@
           name: "Networking plugin"
           value: {{ controller.networking }}
         ram_allocation_ratio:
-          name: "RAM allocation ration"
+          name: "RAM allocation ratio"
           value: {{ controller.ram_allocation_ratio }}
         cpu_allocation_ratio:
-          name: "CPU allocation ration"
+          name: "CPU allocation ratio"
           value: {{ controller.cpu_allocation_ratio }}
+        disk_allocation_ratio:
+          name: "Disk allocation ratio"
+          value: {{ controller.disk_allocation_ratio }}
         dhcp_domain:
           name: "DHCP domain"
           value: {{ controller.dhcp_domain }}
diff --git a/other-requirements.txt b/other-requirements.txt
new file mode 100644
index 0000000..ba84cc5
--- /dev/null
+++ b/other-requirements.txt
@@ -0,0 +1 @@
+python-yaml
diff --git a/tests/pillar/control_cluster.sls b/tests/pillar/control_cluster.sls
index 26a8af0..2de3368 100644
--- a/tests/pillar/control_cluster.sls
+++ b/tests/pillar/control_cluster.sls
@@ -9,6 +9,7 @@
     scheduler_default_filters: "DifferentHostFilter,RetryFilter,AvailabilityZoneFilter,RamFilter,CoreFilter,DiskFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter"
     cpu_allocation_ratio: 16.0
     ram_allocation_ratio: 1.5
+    disk_allocation_ratio: 1.0
     bind:
       private_address: 127.0.0.1
       public_address: 127.0.0.1
diff --git a/tests/pillar/control_single.sls b/tests/pillar/control_single.sls
index 929dc28..6b55229 100644
--- a/tests/pillar/control_single.sls
+++ b/tests/pillar/control_single.sls
@@ -9,6 +9,7 @@
     scheduler_default_filters: "DifferentHostFilter,RetryFilter,AvailabilityZoneFilter,RamFilter,CoreFilter,DiskFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter"
     cpu_allocation_ratio: 16.0
     ram_allocation_ratio: 1.5
+    disk_allocation_ratio: 1.0
     bind:
       private_address: 127.0.0.1
       public_address: 127.0.0.1