diff --git a/doc/v3/api_samples/os-aggregates/aggregate-post-resp.json b/doc/v3/api_samples/os-aggregates/aggregate-post-resp.json
index ab469313b..1f8ab1809 100644
--- a/doc/v3/api_samples/os-aggregates/aggregate-post-resp.json
+++ b/doc/v3/api_samples/os-aggregates/aggregate-post-resp.json
@@ -2,10 +2,10 @@
     "aggregate": {
         "availability_zone": "nova",
         "created_at": "2013-08-18T12:17:55.751757",
-        "deleted": 0,
+        "deleted": false,
         "deleted_at": null,
         "id": 1,
         "name": "name",
         "updated_at": null
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-aggregates/aggregate-update-post-resp.json b/doc/v3/api_samples/os-aggregates/aggregate-update-post-resp.json
index 7ff290988..c59a82f15 100644
--- a/doc/v3/api_samples/os-aggregates/aggregate-update-post-resp.json
+++ b/doc/v3/api_samples/os-aggregates/aggregate-update-post-resp.json
@@ -2,7 +2,7 @@
     "aggregate": {
         "availability_zone": "nova2",
         "created_at": "2013-08-18T12:17:56.259751",
-        "deleted": 0,
+        "deleted": false,
         "deleted_at": null,
         "hosts": [],
         "id": 1,
@@ -12,4 +12,4 @@
         "name": "newname",
         "updated_at": "2013-08-18T12:17:56.286720"
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-aggregates/aggregates-add-host-post-resp.json b/doc/v3/api_samples/os-aggregates/aggregates-add-host-post-resp.json
index 493e48c7c..568be44eb 100644
--- a/doc/v3/api_samples/os-aggregates/aggregates-add-host-post-resp.json
+++ b/doc/v3/api_samples/os-aggregates/aggregates-add-host-post-resp.json
@@ -2,7 +2,7 @@
     "aggregate": {
         "availability_zone": "nova",
         "created_at": "2013-08-18T12:17:56.297823",
-        "deleted": 0,
+        "deleted": false,
         "deleted_at": null,
         "hosts": [
             "21549b2f665945baaa7101926a00143c"
@@ -14,4 +14,4 @@
         "name": "name",
         "updated_at": null
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-aggregates/aggregates-get-resp.json b/doc/v3/api_samples/os-aggregates/aggregates-get-resp.json
index 42fd78bf2..08f4b8ed0 100644
--- a/doc/v3/api_samples/os-aggregates/aggregates-get-resp.json
+++ b/doc/v3/api_samples/os-aggregates/aggregates-get-resp.json
@@ -2,7 +2,7 @@
     "aggregate": {
         "availability_zone": "nova",
         "created_at": "2013-08-18T12:17:56.380226",
-        "deleted": 0,
+        "deleted": false,
         "deleted_at": null,
         "hosts": [],
         "id": 1,
@@ -12,4 +12,4 @@
         "name": "name",
         "updated_at": null
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-aggregates/aggregates-list-get-resp.json b/doc/v3/api_samples/os-aggregates/aggregates-list-get-resp.json
index d65dee173..f10de405f 100644
--- a/doc/v3/api_samples/os-aggregates/aggregates-list-get-resp.json
+++ b/doc/v3/api_samples/os-aggregates/aggregates-list-get-resp.json
@@ -3,7 +3,7 @@
         {
             "availability_zone": "nova",
             "created_at": "2013-08-18T12:17:56.856455",
-            "deleted": 0,
+            "deleted": false,
             "deleted_at": null,
             "hosts": [],
             "id": 1,
@@ -14,4 +14,4 @@
             "updated_at": null
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-aggregates/aggregates-metadata-post-resp.json b/doc/v3/api_samples/os-aggregates/aggregates-metadata-post-resp.json
index c0800eb97..83bf953f0 100644
--- a/doc/v3/api_samples/os-aggregates/aggregates-metadata-post-resp.json
+++ b/doc/v3/api_samples/os-aggregates/aggregates-metadata-post-resp.json
@@ -2,7 +2,7 @@
     "aggregate": {
         "availability_zone": "nova",
         "created_at": "2013-08-18T12:17:55.959571",
-        "deleted": 0,
+        "deleted": false,
         "deleted_at": null,
         "hosts": [],
         "id": 1,
@@ -13,4 +13,4 @@
         "name": "name",
         "updated_at": null
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-aggregates/aggregates-remove-host-post-resp.json b/doc/v3/api_samples/os-aggregates/aggregates-remove-host-post-resp.json
index 7ada72640..732766b1f 100644
--- a/doc/v3/api_samples/os-aggregates/aggregates-remove-host-post-resp.json
+++ b/doc/v3/api_samples/os-aggregates/aggregates-remove-host-post-resp.json
@@ -2,7 +2,7 @@
     "aggregate": {
         "availability_zone": "nova",
         "created_at": "2013-08-18T12:17:56.990581",
-        "deleted": 0,
+        "deleted": false,
         "deleted_at": null,
         "hosts": [],
         "id": 1,
@@ -12,4 +12,4 @@
         "name": "name",
         "updated_at": null
     }
-}
\ No newline at end of file
+}
diff --git a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-post-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-post-resp.json.tpl
index 40418501e..935643d03 100644
--- a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-post-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-post-resp.json.tpl
@@ -2,7 +2,7 @@
     "aggregate": {
         "availability_zone": "nova",
         "created_at": "%(strtime)s",
-        "deleted": 0,
+        "deleted": false,
         "deleted_at": null,
         "id": %(aggregate_id)s,
         "name": "name",
diff --git a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-update-post-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-update-post-resp.json.tpl
index e7d32bf20..2e229a473 100644
--- a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-update-post-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-update-post-resp.json.tpl
@@ -2,7 +2,7 @@
     "aggregate": {
         "availability_zone": "nova2",
         "created_at": "%(strtime)s",
-        "deleted": 0,
+        "deleted": false,
         "deleted_at": null,
         "hosts": [],
         "id": 1,
diff --git a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-add-host-post-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-add-host-post-resp.json.tpl
index 217dd9e29..e5775c206 100644
--- a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-add-host-post-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-add-host-post-resp.json.tpl
@@ -2,7 +2,7 @@
     "aggregate": {
         "availability_zone": "nova",
         "created_at": "%(strtime)s",
-        "deleted": 0,
+        "deleted": false,
         "deleted_at": null,
         "hosts": [
             "%(compute_host)s"
diff --git a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-get-resp.json.tpl
index 9e2c4aa1e..b91781fae 100644
--- a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-get-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-get-resp.json.tpl
@@ -2,7 +2,7 @@
     "aggregate": {
         "availability_zone": "nova",
         "created_at": "%(strtime)s",
-        "deleted": 0,
+        "deleted": false,
         "deleted_at": null,
         "hosts": [],
         "id": 1,
diff --git a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-list-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-list-get-resp.json.tpl
index 21e598ff5..642653d1e 100644
--- a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-list-get-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-list-get-resp.json.tpl
@@ -3,7 +3,7 @@
         {
             "availability_zone": "nova",
             "created_at": "%(strtime)s",
-            "deleted": 0,
+            "deleted": false,
             "deleted_at": null,
             "hosts": [],
             "id": 1,
diff --git a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-metadata-post-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-metadata-post-resp.json.tpl
index 6feec2d16..b15c40fa5 100644
--- a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-metadata-post-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-metadata-post-resp.json.tpl
@@ -2,7 +2,7 @@
     "aggregate": {
         "availability_zone": "nova",
         "created_at": "%(strtime)s",
-        "deleted": 0,
+        "deleted": false,
         "deleted_at": null,
         "hosts": [],
         "id": 1,
diff --git a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-remove-host-post-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-remove-host-post-resp.json.tpl
index 9e2c4aa1e..b91781fae 100644
--- a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-remove-host-post-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-remove-host-post-resp.json.tpl
@@ -2,7 +2,7 @@
     "aggregate": {
         "availability_zone": "nova",
         "created_at": "%(strtime)s",
-        "deleted": 0,
+        "deleted": false,
         "deleted_at": null,
         "hosts": [],
         "id": 1,