diff --git a/doc/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.json b/doc/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.json
index 42e0e21ce2f0..5c17c84be190 100644
--- a/doc/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.json
+++ b/doc/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.json
@@ -2,7 +2,7 @@
     "flavors": [
         {
             "OS-FLV-DISABLED:disabled": false,
-            "disk": 0,
+            "disk": 1,
             "id": "1",
             "links": [
                 {
@@ -91,4 +91,4 @@
             "vcpus": 8
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml b/doc/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml
index 92b51a86644e..95d8b5d6d9e9 100644
--- a/doc/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml
+++ b/doc/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <flavors xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <flavor disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" OS-FLV-DISABLED:disabled="False">
+  <flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" OS-FLV-DISABLED:disabled="False">
     <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
     <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
   </flavor>
@@ -20,4 +20,4 @@
     <atom:link href="http://openstack.example.com/v2/openstack/flavors/5" rel="self"/>
     <atom:link href="http://openstack.example.com/openstack/flavors/5" rel="bookmark"/>
   </flavor>
-</flavors>
\ No newline at end of file
+</flavors>
diff --git a/doc/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.json b/doc/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.json
index 3fd5fa1d7cd1..7587e055b8b4 100644
--- a/doc/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.json
+++ b/doc/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.json
@@ -1,7 +1,7 @@
 {
     "flavor": {
         "OS-FLV-DISABLED:disabled": false,
-        "disk": 0,
+        "disk": 1,
         "id": "1",
         "links": [
             {
@@ -17,4 +17,4 @@
         "ram": 512,
         "vcpus": 1
     }
-}
\ No newline at end of file
+}
diff --git a/doc/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml b/doc/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml
index 6abd2264152f..d49c273d6476 100644
--- a/doc/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml
+++ b/doc/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" OS-FLV-DISABLED:disabled="False">
+<flavor xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" OS-FLV-DISABLED:disabled="False">
   <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
   <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
-</flavor>
\ No newline at end of file
+</flavor>
diff --git a/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.json b/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.json
index 3b421b4e1ddf..3865f4ef9cfa 100644
--- a/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.json
+++ b/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.json
@@ -1,7 +1,7 @@
 {
     "flavor": {
         "OS-FLV-EXT-DATA:ephemeral": 0,
-        "disk": 0,
+        "disk": 1,
         "id": "1",
         "links": [
             {
@@ -17,4 +17,4 @@
         "ram": 512,
         "vcpus": 1
     }
-}
\ No newline at end of file
+}
diff --git a/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml b/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml
index dfecff1fc35f..653e77cda239 100644
--- a/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml
+++ b/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" OS-FLV-EXT-DATA:ephemeral="0">
+<flavor xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" OS-FLV-EXT-DATA:ephemeral="0">
   <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
   <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
-</flavor>
\ No newline at end of file
+</flavor>
diff --git a/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.json b/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.json
index ee7696bed73b..ae29b6c86466 100644
--- a/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.json
+++ b/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.json
@@ -2,7 +2,7 @@
     "flavors": [
         {
             "OS-FLV-EXT-DATA:ephemeral": 0,
-            "disk": 0,
+            "disk": 1,
             "id": "1",
             "links": [
                 {
@@ -91,4 +91,4 @@
             "vcpus": 8
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml b/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml
index 7b53621b7a19..dc48eebd8d6c 100644
--- a/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml
+++ b/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <flavors xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <flavor disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" OS-FLV-EXT-DATA:ephemeral="0">
+  <flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" OS-FLV-EXT-DATA:ephemeral="0">
     <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
     <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
   </flavor>
@@ -20,4 +20,4 @@
     <atom:link href="http://openstack.example.com/v2/openstack/flavors/5" rel="self"/>
     <atom:link href="http://openstack.example.com/openstack/flavors/5" rel="bookmark"/>
   </flavor>
-</flavors>
\ No newline at end of file
+</flavors>
diff --git a/doc/api_samples/all_extensions/flavor-get-resp.json b/doc/api_samples/all_extensions/flavor-get-resp.json
index d37117d84297..b68bc3c979e8 100644
--- a/doc/api_samples/all_extensions/flavor-get-resp.json
+++ b/doc/api_samples/all_extensions/flavor-get-resp.json
@@ -2,7 +2,7 @@
     "flavor": {
         "OS-FLV-DISABLED:disabled": false,
         "OS-FLV-EXT-DATA:ephemeral": 0,
-        "disk": 0,
+        "disk": 1,
         "id": "1",
         "links": [
             {
diff --git a/doc/api_samples/all_extensions/flavor-get-resp.xml b/doc/api_samples/all_extensions/flavor-get-resp.xml
index fe0451c1eb36..53f870ec4ddb 100644
--- a/doc/api_samples/all_extensions/flavor-get-resp.xml
+++ b/doc/api_samples/all_extensions/flavor-get-resp.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" vcpus="1" swap="" rxtx_factor="1.0" disk="0" id="1" os-flavor-access:is_public="True" OS-FLV-EXT-DATA:ephemeral="0" OS-FLV-DISABLED:disabled="False">
+<flavor xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" vcpus="1" swap="" rxtx_factor="1.0" disk="1" id="1" os-flavor-access:is_public="True" OS-FLV-EXT-DATA:ephemeral="0" OS-FLV-DISABLED:disabled="False">
   <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
   <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
-</flavor>
\ No newline at end of file
+</flavor>
diff --git a/doc/api_samples/flavor-get-resp.json b/doc/api_samples/flavor-get-resp.json
index 160238eea595..723be2898fba 100644
--- a/doc/api_samples/flavor-get-resp.json
+++ b/doc/api_samples/flavor-get-resp.json
@@ -1,6 +1,6 @@
 {
     "flavor": {
-        "disk": 0,
+        "disk": 1,
         "id": "1",
         "links": [
             {
@@ -16,4 +16,4 @@
         "ram": 512,
         "vcpus": 1
     }
-}
\ No newline at end of file
+}
diff --git a/doc/api_samples/flavor-get-resp.xml b/doc/api_samples/flavor-get-resp.xml
index 93b91a53147e..1101fdb56b31 100644
--- a/doc/api_samples/flavor-get-resp.xml
+++ b/doc/api_samples/flavor-get-resp.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="0" vcpus="1" ram="512" name="m1.tiny" id="1">
+<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="m1.tiny" id="1">
   <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
   <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
-</flavor>
\ No newline at end of file
+</flavor>
diff --git a/doc/api_samples/os-flavor-access/flavor-access-detail-resp.json b/doc/api_samples/os-flavor-access/flavor-access-detail-resp.json
index f5e8a7584259..03758ca688d0 100644
--- a/doc/api_samples/os-flavor-access/flavor-access-detail-resp.json
+++ b/doc/api_samples/os-flavor-access/flavor-access-detail-resp.json
@@ -1,7 +1,7 @@
 {
     "flavors": [
         {
-            "disk": 0,
+            "disk": 1,
             "id": "1",
             "links": [
                 {
@@ -91,4 +91,4 @@
             "vcpus": 8
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/api_samples/os-flavor-access/flavor-access-detail-resp.xml b/doc/api_samples/os-flavor-access/flavor-access-detail-resp.xml
index 1cbe69c7d9d7..3099fa98f84c 100644
--- a/doc/api_samples/os-flavor-access/flavor-access-detail-resp.xml
+++ b/doc/api_samples/os-flavor-access/flavor-access-detail-resp.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <flavors xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <flavor disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" os-flavor-access:is_public="True">
+  <flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" os-flavor-access:is_public="True">
     <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
     <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
   </flavor>
@@ -20,4 +20,4 @@
     <atom:link href="http://openstack.example.com/v2/openstack/flavors/5" rel="self"/>
     <atom:link href="http://openstack.example.com/openstack/flavors/5" rel="bookmark"/>
   </flavor>
-</flavors>
\ No newline at end of file
+</flavors>
diff --git a/doc/api_samples/os-flavor-access/flavor-access-show-resp.json b/doc/api_samples/os-flavor-access/flavor-access-show-resp.json
index a60b8cc62dd4..0a27a086d64a 100644
--- a/doc/api_samples/os-flavor-access/flavor-access-show-resp.json
+++ b/doc/api_samples/os-flavor-access/flavor-access-show-resp.json
@@ -1,6 +1,6 @@
 {
     "flavor": {
-        "disk": 0,
+        "disk": 1,
         "id": "1",
         "links": [
             {
@@ -17,4 +17,4 @@
         "ram": 512,
         "vcpus": 1
     }
-}
\ No newline at end of file
+}
diff --git a/doc/api_samples/os-flavor-access/flavor-access-show-resp.xml b/doc/api_samples/os-flavor-access/flavor-access-show-resp.xml
index ae699cb07d79..3fa7f0c4313e 100644
--- a/doc/api_samples/os-flavor-access/flavor-access-show-resp.xml
+++ b/doc/api_samples/os-flavor-access/flavor-access-show-resp.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" os-flavor-access:is_public="True">
+<flavor xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" os-flavor-access:is_public="True">
   <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
   <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
-</flavor>
\ No newline at end of file
+</flavor>
diff --git a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json b/doc/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json
index 63eaddeb6754..ac67e6585fdb 100644
--- a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json
+++ b/doc/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json
@@ -1,6 +1,6 @@
 {
     "flavor": {
-        "disk": 0,
+        "disk": 1,
         "id": "1",
         "links": [
             {
@@ -17,4 +17,4 @@
         "rxtx_factor": 1.0,
         "vcpus": 1
     }
-}
\ No newline at end of file
+}
diff --git a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml b/doc/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml
index 78b430ecaf4f..a07dfcfb99c5 100644
--- a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml
+++ b/doc/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" rxtx_factor="1.0">
+<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" rxtx_factor="1.0">
   <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
   <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
-</flavor>
\ No newline at end of file
+</flavor>
diff --git a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json b/doc/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json
index 81e9c993cc62..03f4360d9147 100644
--- a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json
+++ b/doc/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json
@@ -1,7 +1,7 @@
 {
     "flavors": [
         {
-            "disk": 0,
+            "disk": 1,
             "id": "1",
             "links": [
                 {
@@ -91,4 +91,4 @@
             "vcpus": 8
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml b/doc/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml
index 05192e3f9c2f..c204e7cdfce6 100644
--- a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml
+++ b/doc/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <flavors xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <flavor disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" rxtx_factor="1.0">
+  <flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" rxtx_factor="1.0">
     <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
     <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
   </flavor>
@@ -20,4 +20,4 @@
     <atom:link href="http://openstack.example.com/v2/openstack/flavors/5" rel="self"/>
     <atom:link href="http://openstack.example.com/openstack/flavors/5" rel="bookmark"/>
   </flavor>
-</flavors>
\ No newline at end of file
+</flavors>
diff --git a/doc/api_samples/os-flavor-swap/flavor-swap-get-resp.json b/doc/api_samples/os-flavor-swap/flavor-swap-get-resp.json
index 15604fe2bf23..2a8e394dbc15 100644
--- a/doc/api_samples/os-flavor-swap/flavor-swap-get-resp.json
+++ b/doc/api_samples/os-flavor-swap/flavor-swap-get-resp.json
@@ -1,6 +1,6 @@
 {
     "flavor": {
-        "disk": 0,
+        "disk": 1,
         "id": "1",
         "links": [
             {
@@ -17,4 +17,4 @@
         "swap": "",
         "vcpus": 1
     }
-}
\ No newline at end of file
+}
diff --git a/doc/api_samples/os-flavor-swap/flavor-swap-get-resp.xml b/doc/api_samples/os-flavor-swap/flavor-swap-get-resp.xml
index 5357967f3a4a..2cf38aa6cd3e 100644
--- a/doc/api_samples/os-flavor-swap/flavor-swap-get-resp.xml
+++ b/doc/api_samples/os-flavor-swap/flavor-swap-get-resp.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" swap="">
+<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" swap="">
   <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
   <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
-</flavor>
\ No newline at end of file
+</flavor>
diff --git a/doc/api_samples/os-flavor-swap/flavor-swap-list-resp.json b/doc/api_samples/os-flavor-swap/flavor-swap-list-resp.json
index 5bb94f34865f..b5377ed4a4f5 100644
--- a/doc/api_samples/os-flavor-swap/flavor-swap-list-resp.json
+++ b/doc/api_samples/os-flavor-swap/flavor-swap-list-resp.json
@@ -1,7 +1,7 @@
 {
     "flavors": [
         {
-            "disk": 0,
+            "disk": 1,
             "id": "1",
             "links": [
                 {
@@ -91,4 +91,4 @@
             "vcpus": 8
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/api_samples/os-flavor-swap/flavor-swap-list-resp.xml b/doc/api_samples/os-flavor-swap/flavor-swap-list-resp.xml
index 55b54f700c80..d9a40dd962df 100644
--- a/doc/api_samples/os-flavor-swap/flavor-swap-list-resp.xml
+++ b/doc/api_samples/os-flavor-swap/flavor-swap-list-resp.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <flavors xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <flavor disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" swap="">
+  <flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" swap="">
     <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
     <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
   </flavor>
@@ -20,4 +20,4 @@
     <atom:link href="http://openstack.example.com/v2/openstack/flavors/5" rel="self"/>
     <atom:link href="http://openstack.example.com/openstack/flavors/5" rel="bookmark"/>
   </flavor>
-</flavors>
\ No newline at end of file
+</flavors>
diff --git a/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json b/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json
index 5020a2a81f17..6ab0e1fd5fde 100644
--- a/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json
+++ b/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json
@@ -6,7 +6,7 @@
                 "flavor": "m1.tiny",
                 "hours": 1.0,
                 "instance_id": "1f1deceb-17b5-4c04-84c7-e0d4499c8fe0",
-                "local_gb": 0,
+                "local_gb": 1,
                 "memory_mb": 512,
                 "name": "new-server-test",
                 "started_at": "2012-10-08T20:10:44.541277",
@@ -20,8 +20,8 @@
         "stop": "2012-10-08T21:10:44.587336",
         "tenant_id": "openstack",
         "total_hours": 1.0,
-        "total_local_gb_usage": 0.0,
+        "total_local_gb_usage": 1.0,
         "total_memory_mb_usage": 512.0,
         "total_vcpus_usage": 1.0
     }
-}
\ No newline at end of file
+}
diff --git a/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml b/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml
index 2da8ebea1beb..56f95edc48a2 100644
--- a/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml
+++ b/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <tenant_usage>
   <tenant_id>openstack</tenant_id>
-  <total_local_gb_usage>0.0</total_local_gb_usage>
+  <total_local_gb_usage>1.0</total_local_gb_usage>
   <total_vcpus_usage>1.0</total_vcpus_usage>
   <total_memory_mb_usage>512.0</total_memory_mb_usage>
   <total_hours>1.0</total_hours>
@@ -13,7 +13,7 @@
       <name>new-server-test</name>
       <hours>1.0</hours>
       <memory_mb>512</memory_mb>
-      <local_gb>0</local_gb>
+      <local_gb>1</local_gb>
       <vcpus>1</vcpus>
       <tenant_id>openstack</tenant_id>
       <flavor>m1.tiny</flavor>
@@ -23,4 +23,4 @@
       <uptime>3600</uptime>
     </server_usage>
   </server_usages>
-</tenant_usage>
\ No newline at end of file
+</tenant_usage>
diff --git a/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json b/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json
index fb1d0f79f0ef..ba45c4b5cf55 100644
--- a/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json
+++ b/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json
@@ -5,9 +5,9 @@
             "stop": "2012-10-08T22:10:44.587336",
             "tenant_id": "openstack",
             "total_hours": 1.0,
-            "total_local_gb_usage": 0.0,
+            "total_local_gb_usage": 1.0,
             "total_memory_mb_usage": 512.0,
             "total_vcpus_usage": 1.0
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml b/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml
index 4fca57e1d328..8807691b747b 100644
--- a/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml
+++ b/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml
@@ -2,7 +2,7 @@
 <tenant_usages>
   <tenant_usage>
     <tenant_id>openstack</tenant_id>
-    <total_local_gb_usage>0.0</total_local_gb_usage>
+    <total_local_gb_usage>1.0</total_local_gb_usage>
     <total_vcpus_usage>1.0</total_vcpus_usage>
     <total_memory_mb_usage>512.0</total_memory_mb_usage>
     <total_hours>1.0</total_hours>
@@ -10,4 +10,4 @@
     <stop>2012-10-08 22:10:51.902640</stop>
     <server_usages/>
   </tenant_usage>
-</tenant_usages>
\ No newline at end of file
+</tenant_usages>
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py b/nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py
index 1b688a883116..a24cabb2fc12 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py
@@ -38,7 +38,7 @@ def MediumText():
 
 def _populate_instance_types(instance_types_table):
     default_inst_types = {
-        'm1.tiny': dict(mem=512, vcpus=1, root_gb=0, eph_gb=0, flavid=1),
+        'm1.tiny': dict(mem=512, vcpus=1, root_gb=1, eph_gb=0, flavid=1),
         'm1.small': dict(mem=2048, vcpus=1, root_gb=20, eph_gb=0, flavid=2),
         'm1.medium': dict(mem=4096, vcpus=2, root_gb=40, eph_gb=0, flavid=3),
         'm1.large': dict(mem=8192, vcpus=4, root_gb=80, eph_gb=0, flavid=4),
diff --git a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.json.tpl b/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.json.tpl
index d1f78c08e2c0..04083d063c5b 100644
--- a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.json.tpl
@@ -2,7 +2,7 @@
     "flavors": [
         {
             "OS-FLV-DISABLED:disabled": false,
-            "disk": 0,
+            "disk": 1,
             "id": "1",
             "links": [
                 {
diff --git a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml.tpl
index 8d992e42d120..5d73195fad90 100644
--- a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml.tpl
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <flavors xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <flavor disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" OS-FLV-DISABLED:disabled="False">
+  <flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" OS-FLV-DISABLED:disabled="False">
     <atom:link href="%(host)s/v2/openstack/flavors/1" rel="self"/>
     <atom:link href="%(host)s/openstack/flavors/1" rel="bookmark"/>
   </flavor>
diff --git a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.json.tpl b/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.json.tpl
index cf5fb232afcc..a47af7b187f1 100644
--- a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.json.tpl
@@ -1,7 +1,7 @@
 {
     "flavor": {
         "OS-FLV-DISABLED:disabled": false,
-        "disk": 0,
+        "disk": 1,
         "id": "%(flavor_id)s",
         "links": [
             {
diff --git a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml.tpl
index c7bdd1ca885c..13908e2ac64e 100644
--- a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml.tpl
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="0" vcpus="1" ram="512" name="m1.tiny" id="%(flavor_id)s" OS-FLV-DISABLED:disabled="False">
+<flavor xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="m1.tiny" id="%(flavor_id)s" OS-FLV-DISABLED:disabled="False">
   <atom:link href="%(host)s/v2/openstack/flavors/%(flavor_id)s" rel="self"/>
   <atom:link href="%(host)s/openstack/flavors/%(flavor_id)s" rel="bookmark"/>
 </flavor>
diff --git a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.json.tpl b/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.json.tpl
index 3422de9f5ebd..b86db0a46142 100644
--- a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.json.tpl
@@ -1,7 +1,7 @@
 {
     "flavor": {
         "OS-FLV-EXT-DATA:ephemeral": 0,
-        "disk": 0,
+        "disk": 1,
         "id": "%(flavor_id)s",
         "links": [
             {
diff --git a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml.tpl
index dc143010a88c..da45536c3756 100644
--- a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml.tpl
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="0" vcpus="1" ram="512" name="%(flavor_name)s" id="%(flavor_id)s" OS-FLV-EXT-DATA:ephemeral="0">
+<flavor xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="%(flavor_name)s" id="%(flavor_id)s" OS-FLV-EXT-DATA:ephemeral="0">
   <atom:link href="%(host)s/v2/openstack/flavors/%(flavor_id)s" rel="self"/>
   <atom:link href="%(host)s/openstack/flavors/%(flavor_id)s" rel="bookmark"/>
 </flavor>
diff --git a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.json.tpl b/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.json.tpl
index 2c79efeaf468..a798262f3533 100644
--- a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.json.tpl
@@ -2,7 +2,7 @@
     "flavors": [
         {
             "OS-FLV-EXT-DATA:ephemeral": 0,
-            "disk": 0,
+            "disk": 1,
             "id": "1",
             "links": [
                 {
diff --git a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml.tpl
index 7108ebd79be8..5ba463188474 100644
--- a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml.tpl
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <flavors xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <flavor disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" OS-FLV-EXT-DATA:ephemeral="0">
+  <flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" OS-FLV-EXT-DATA:ephemeral="0">
     <atom:link href="%(host)s/v2/openstack/flavors/1" rel="self"/>
     <atom:link href="%(host)s/openstack/flavors/1" rel="bookmark"/>
   </flavor>
diff --git a/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.json.tpl b/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.json.tpl
index bbd681e66a5b..b68bc3c979e8 100644
--- a/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.json.tpl
@@ -2,7 +2,7 @@
     "flavor": {
         "OS-FLV-DISABLED:disabled": false,
         "OS-FLV-EXT-DATA:ephemeral": 0,
-        "disk": 0,
+        "disk": 1,
         "id": "1",
         "links": [
             {
@@ -21,4 +21,4 @@
         "swap": "",
         "vcpus": 1
     }
-}
\ No newline at end of file
+}
diff --git a/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.xml.tpl b/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.xml.tpl
index 920b82e536ec..53f870ec4ddb 100644
--- a/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.xml.tpl
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" vcpus="1" swap="" rxtx_factor="1.0" disk="0" id="1" os-flavor-access:is_public="True" OS-FLV-EXT-DATA:ephemeral="0" OS-FLV-DISABLED:disabled="False">
+<flavor xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" vcpus="1" swap="" rxtx_factor="1.0" disk="1" id="1" os-flavor-access:is_public="True" OS-FLV-EXT-DATA:ephemeral="0" OS-FLV-DISABLED:disabled="False">
   <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
   <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
 </flavor>
diff --git a/nova/tests/integrated/api_samples/flavor-get-resp.json.tpl b/nova/tests/integrated/api_samples/flavor-get-resp.json.tpl
index 86ff86fa17cd..723be2898fba 100644
--- a/nova/tests/integrated/api_samples/flavor-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/flavor-get-resp.json.tpl
@@ -1,6 +1,6 @@
 {
     "flavor": {
-        "disk": 0,
+        "disk": 1,
         "id": "1",
         "links": [
             {
diff --git a/nova/tests/integrated/api_samples/flavor-get-resp.xml.tpl b/nova/tests/integrated/api_samples/flavor-get-resp.xml.tpl
index ca49884f30c4..5925c588d018 100644
--- a/nova/tests/integrated/api_samples/flavor-get-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/flavor-get-resp.xml.tpl
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" vcpus="1" disk="0" id="1">
+<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" vcpus="1" disk="1" id="1">
   <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
   <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
 </flavor>
diff --git a/nova/tests/integrated/api_samples/flavors-list-resp.json.tpl b/nova/tests/integrated/api_samples/flavors-list-resp.json.tpl
index ab86d2a52ac1..fb9a8ff1f6b9 100644
--- a/nova/tests/integrated/api_samples/flavors-list-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/flavors-list-resp.json.tpl
@@ -71,4 +71,4 @@
             "name": "m1.xlarge"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.json.tpl b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.json.tpl
index 711207d2d549..b5f1eea5428e 100644
--- a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.json.tpl
@@ -1,7 +1,7 @@
 {
     "flavors": [
         {
-            "disk": 0,
+            "disk": 1,
             "id": "1",
             "links": [
                 {
diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.xml.tpl b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.xml.tpl
index cdef74cce7b0..8ee66226a522 100644
--- a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.xml.tpl
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <flavors xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <flavor disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" os-flavor-access:is_public="True">
+  <flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" os-flavor-access:is_public="True">
     <atom:link href="%(host)s/v2/openstack/flavors/1" rel="self"/>
     <atom:link href="%(host)s/openstack/flavors/1" rel="bookmark"/>
   </flavor>
diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.json.tpl b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.json.tpl
index 975f38661d2f..2e991a4ceff7 100644
--- a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.json.tpl
@@ -1,6 +1,6 @@
 {
     "flavor": {
-        "disk": 0,
+        "disk": 1,
         "id": "%(flavor_id)s",
         "links": [
             {
diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.xml.tpl b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.xml.tpl
index f9a3ff1787c8..ae18daba2283 100644
--- a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.xml.tpl
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="0" vcpus="1" ram="512" name="m1.tiny" id="%(flavor_id)s" os-flavor-access:is_public="True">
+<flavor xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="m1.tiny" id="%(flavor_id)s" os-flavor-access:is_public="True">
   <atom:link href="%(host)s/v2/openstack/flavors/%(flavor_id)s" rel="self"/>
   <atom:link href="%(host)s/openstack/flavors/%(flavor_id)s" rel="bookmark"/>
 </flavor>
diff --git a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl b/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl
index a7f3a1993caf..241cf7c8001c 100644
--- a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl
@@ -1,6 +1,6 @@
 {
     "flavor": {
-        "disk": 0,
+        "disk": 1,
         "id": "%(flavor_id)s",
         "links": [
             {
diff --git a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl b/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl
index 4feec740c772..d461b443ed5e 100644
--- a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" rxtx_factor="1.0">
+<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" rxtx_factor="1.0">
   <atom:link href="%(host)s/v2/openstack/flavors/1" rel="self"/>
   <atom:link href="%(host)s/openstack/flavors/1" rel="bookmark"/>
 </flavor>
diff --git a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl b/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl
index 5b27e1385e3f..035c860c9a0c 100644
--- a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl
@@ -1,7 +1,7 @@
 {
     "flavors": [
         {
-            "disk": 0,
+            "disk": 1,
             "id": "1",
             "links": [
                 {
diff --git a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl b/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl
index fb2ee09e0a75..ee937b974b93 100644
--- a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <flavors xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <flavor disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" rxtx_factor="1.0">
+  <flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" rxtx_factor="1.0">
     <atom:link href="%(host)s/v2/openstack/flavors/1" rel="self"/>
     <atom:link href="%(host)s/openstack/flavors/1" rel="bookmark"/>
   </flavor>
diff --git a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.json.tpl b/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.json.tpl
index be9afe01226a..9b7e57c8a936 100644
--- a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.json.tpl
@@ -1,6 +1,6 @@
 {
     "flavor": {
-        "disk": 0,
+        "disk": 1,
         "id": "%(flavor_id)s",
         "links": [
             {
diff --git a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.xml.tpl b/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.xml.tpl
index 53afae086502..9375b14b5e50 100644
--- a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.xml.tpl
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="0" vcpus="1" ram="512" name="%(flavor_name)s" id="%(flavor_id)s" swap="">
+<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="%(flavor_name)s" id="%(flavor_id)s" swap="">
   <atom:link href="%(host)s/v2/openstack/flavors/%(flavor_id)s" rel="self"/>
   <atom:link href="%(host)s/openstack/flavors/%(flavor_id)s" rel="bookmark"/>
 </flavor>
diff --git a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.json.tpl b/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.json.tpl
index c46a1695d599..1367e75de5b9 100644
--- a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.json.tpl
@@ -1,7 +1,7 @@
 {
     "flavors": [
         {
-            "disk": 0,
+            "disk": 1,
             "id": "1",
             "links": [
                 {
diff --git a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.xml.tpl b/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.xml.tpl
index ced8e1779022..7c9c589bef07 100644
--- a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.xml.tpl
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <flavors xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <flavor disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" swap="">
+  <flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" swap="">
     <atom:link href="%(host)s/v2/openstack/flavors/1" rel="self"/>
     <atom:link href="%(host)s/openstack/flavors/1" rel="bookmark"/>
   </flavor>
diff --git a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl b/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl
index 68092f353535..a12dd7157f32 100644
--- a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl
+++ b/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl
@@ -6,7 +6,7 @@
                 "flavor": "m1.tiny",
                 "hours": 1.0,
                 "instance_id": "%(uuid)s",
-                "local_gb": 0,
+                "local_gb": 1,
                 "memory_mb": 512,
                 "name": "new-server-test",
                 "started_at": "%(timestamp)s",
@@ -20,7 +20,7 @@
         "stop": "%(timestamp)s",
         "tenant_id": "openstack",
         "total_hours": 1.0,
-        "total_local_gb_usage": 0.0,
+        "total_local_gb_usage": 1.0,
         "total_memory_mb_usage": 512.0,
         "total_vcpus_usage": 1.0
     }
diff --git a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml.tpl b/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml.tpl
index a8a065fa1b65..4a688230792b 100644
--- a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml.tpl
+++ b/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml.tpl
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <tenant_usage>
   <tenant_id>openstack</tenant_id>
-  <total_local_gb_usage>0.0</total_local_gb_usage>
+  <total_local_gb_usage>1.0</total_local_gb_usage>
   <total_vcpus_usage>1.0</total_vcpus_usage>
   <total_memory_mb_usage>512.0</total_memory_mb_usage>
   <total_hours>1.0</total_hours>
@@ -13,7 +13,7 @@
       <name>new-server-test</name>
       <hours>1.0</hours>
       <memory_mb>512</memory_mb>
-      <local_gb>0</local_gb>
+      <local_gb>1</local_gb>
       <vcpus>1</vcpus>
       <tenant_id>openstack</tenant_id>
       <flavor>m1.tiny</flavor>
diff --git a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl b/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl
index b33ccbfc2ef3..082e6bc90927 100644
--- a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl
+++ b/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl
@@ -5,7 +5,7 @@
             "stop": "%(timestamp)s",
             "tenant_id": "openstack",
             "total_hours": 1.0,
-            "total_local_gb_usage": 0.0,
+            "total_local_gb_usage": 1.0,
             "total_memory_mb_usage": 512.0,
             "total_vcpus_usage": 1.0
         }
diff --git a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml.tpl b/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml.tpl
index 536e797389a9..4a2833da8342 100644
--- a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml.tpl
+++ b/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml.tpl
@@ -2,7 +2,7 @@
 <tenant_usages>
   <tenant_usage>
     <tenant_id>openstack</tenant_id>
-    <total_local_gb_usage>0.0</total_local_gb_usage>
+    <total_local_gb_usage>1.0</total_local_gb_usage>
     <total_vcpus_usage>1.0</total_vcpus_usage>
     <total_memory_mb_usage>512.0</total_memory_mb_usage>
     <total_hours>1.0</total_hours>