diff --git a/doc/v3/api_samples/all_extensions/server-get-resp.json b/doc/v3/api_samples/all_extensions/server-get-resp.json
index 8826f360dc53..867d24c025d8 100644
--- a/doc/v3/api_samples/all_extensions/server-get-resp.json
+++ b/doc/v3/api_samples/all_extensions/server-get-resp.json
@@ -20,13 +20,13 @@
                 }
             ]
         },
-        "host_id": "9cc36101a27c2a69c1a18241f6228454d9d7f466bd90c62db8e8b856",
+        "hostId": "9cc36101a27c2a69c1a18241f6228454d9d7f466bd90c62db8e8b856",
         "id": "f474386b-4fb6-4e1f-b1d5-d6bf4437f7d5",
         "image": {
             "id": "70a599e0-31e7-49b7-b260-868f441e862b",
             "links": [
                 {
-                    "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
                     "rel": "bookmark"
                 }
             ]
diff --git a/doc/v3/api_samples/all_extensions/servers-details-resp.json b/doc/v3/api_samples/all_extensions/servers-details-resp.json
index 9467fb4a401b..0047ffa43665 100644
--- a/doc/v3/api_samples/all_extensions/servers-details-resp.json
+++ b/doc/v3/api_samples/all_extensions/servers-details-resp.json
@@ -21,13 +21,13 @@
                     }
                 ]
             },
-            "host_id": "f1e160ad2bf07084f3d3e0dfdd0795d80da18a60825322c15775c0dd",
+            "hostId": "f1e160ad2bf07084f3d3e0dfdd0795d80da18a60825322c15775c0dd",
             "id": "9cbefc35-d372-40c5-88e2-9fda1b6ea12c",
             "image": {
                 "id": "70a599e0-31e7-49b7-b260-868f441e862b",
                 "links": [
                     {
-                        "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                        "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
                         "rel": "bookmark"
                     }
                 ]
diff --git a/doc/v3/api_samples/os-access-ips/server-action-rebuild-resp.json b/doc/v3/api_samples/os-access-ips/server-action-rebuild-resp.json
index 22e09b6f7b14..5c0013842f37 100644
--- a/doc/v3/api_samples/os-access-ips/server-action-rebuild-resp.json
+++ b/doc/v3/api_samples/os-access-ips/server-action-rebuild-resp.json
@@ -21,13 +21,13 @@
                 }
             ]
         },
-        "host_id": "5c8072dbcda8ce3f26deb6662bd7718e1a6d349bdf2296911d1be4ac",
+        "hostId": "5c8072dbcda8ce3f26deb6662bd7718e1a6d349bdf2296911d1be4ac",
         "id": "53a63a19-c145-47f8-9ae5-b39d6bff33ec",
         "image": {
             "id": "70a599e0-31e7-49b7-b260-868f441e862b",
             "links": [
                 {
-                    "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
                     "rel": "bookmark"
                 }
             ]
diff --git a/doc/v3/api_samples/os-access-ips/server-get-resp.json b/doc/v3/api_samples/os-access-ips/server-get-resp.json
index 5810f469ad98..e0ce06206012 100644
--- a/doc/v3/api_samples/os-access-ips/server-get-resp.json
+++ b/doc/v3/api_samples/os-access-ips/server-get-resp.json
@@ -20,13 +20,13 @@
                 }
             ]
         },
-        "host_id": "b3a6fd97c027e18d6d9c7506eea8a236cf2ceca420cfdfe0239a64a8",
+        "hostId": "b3a6fd97c027e18d6d9c7506eea8a236cf2ceca420cfdfe0239a64a8",
         "id": "5eedbf0c-c303-4ed3-933a-a4d3732cfa0a",
         "image": {
             "id": "70a599e0-31e7-49b7-b260-868f441e862b",
             "links": [
                 {
-                    "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
                     "rel": "bookmark"
                 }
             ]
diff --git a/doc/v3/api_samples/os-access-ips/server-put-resp.json b/doc/v3/api_samples/os-access-ips/server-put-resp.json
index 620574c5c609..f8f0cf3d9b11 100644
--- a/doc/v3/api_samples/os-access-ips/server-put-resp.json
+++ b/doc/v3/api_samples/os-access-ips/server-put-resp.json
@@ -20,13 +20,13 @@
                 }
             ]
         },
-        "host_id": "ea0fd522e5bc2fea872429b331304a6f930f2d9aa2a5dc95b3c6061a",
+        "hostId": "ea0fd522e5bc2fea872429b331304a6f930f2d9aa2a5dc95b3c6061a",
         "id": "fea9595c-ce6e-4565-987e-2d301fe056ac",
         "image": {
             "id": "70a599e0-31e7-49b7-b260-868f441e862b",
             "links": [
                 {
-                    "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
                     "rel": "bookmark"
                 }
             ]
diff --git a/doc/v3/api_samples/os-access-ips/servers-details-resp.json b/doc/v3/api_samples/os-access-ips/servers-details-resp.json
index c757662332b5..bce7408599dc 100644
--- a/doc/v3/api_samples/os-access-ips/servers-details-resp.json
+++ b/doc/v3/api_samples/os-access-ips/servers-details-resp.json
@@ -21,13 +21,13 @@
                     }
                 ]
             },
-            "host_id": "9896cb12c9845becf1b9b06c8ff5b131d20300f83e2cdffc92e3f4a4",
+            "hostId": "9896cb12c9845becf1b9b06c8ff5b131d20300f83e2cdffc92e3f4a4",
             "id": "934760e1-2b0b-4f9e-a916-eac1e69839dc",
             "image": {
                 "id": "70a599e0-31e7-49b7-b260-868f441e862b",
                 "links": [
                     {
-                        "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                        "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
                         "rel": "bookmark"
                     }
                 ]
diff --git a/doc/v3/api_samples/os-config-drive/server-config-drive-get-resp.json b/doc/v3/api_samples/os-config-drive/server-config-drive-get-resp.json
index d31c241f1a99..1eb56f1cc822 100644
--- a/doc/v3/api_samples/os-config-drive/server-config-drive-get-resp.json
+++ b/doc/v3/api_samples/os-config-drive/server-config-drive-get-resp.json
@@ -20,13 +20,13 @@
                 }
             ]
         },
-        "host_id": "1642bbdbd61a0f1c513b4bb6e418326103172698104bfa278eca106b",
+        "hostId": "1642bbdbd61a0f1c513b4bb6e418326103172698104bfa278eca106b",
         "id": "7838ff1b-b71f-48b9-91e9-7c08de20b249",
         "image": {
             "id": "70a599e0-31e7-49b7-b260-868f441e862b",
             "links": [
                 {
-                    "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
                     "rel": "bookmark"
                 }
             ]
diff --git a/doc/v3/api_samples/os-config-drive/servers-config-drive-details-resp.json b/doc/v3/api_samples/os-config-drive/servers-config-drive-details-resp.json
index 97b96e7a7dd1..fbc627f34f4e 100644
--- a/doc/v3/api_samples/os-config-drive/servers-config-drive-details-resp.json
+++ b/doc/v3/api_samples/os-config-drive/servers-config-drive-details-resp.json
@@ -21,13 +21,13 @@
                     }
                 ]
             },
-            "host_id": "1ed067c90341cd9d94bbe5da960922b56f107262cdc75719a0d97b78",
+            "hostId": "1ed067c90341cd9d94bbe5da960922b56f107262cdc75719a0d97b78",
             "id": "f0318e69-11eb-4aed-9840-59b6c72beee8",
             "image": {
                 "id": "70a599e0-31e7-49b7-b260-868f441e862b",
                 "links": [
                     {
-                        "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                        "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
                         "rel": "bookmark"
                     }
                 ]
diff --git a/doc/v3/api_samples/os-extended-availability-zone/server-get-resp.json b/doc/v3/api_samples/os-extended-availability-zone/server-get-resp.json
index 940f125cf9c1..2f4ca3724d5d 100644
--- a/doc/v3/api_samples/os-extended-availability-zone/server-get-resp.json
+++ b/doc/v3/api_samples/os-extended-availability-zone/server-get-resp.json
@@ -20,13 +20,13 @@
                 }
             ]
         },
-        "host_id": "b75d6736650f9b272223ceb48f4cde001de1856e381613a922117ab7",
+        "hostId": "b75d6736650f9b272223ceb48f4cde001de1856e381613a922117ab7",
         "id": "f22e4521-d03a-4e9f-9fd3-016b9e227219",
         "image": {
             "id": "70a599e0-31e7-49b7-b260-868f441e862b",
             "links": [
                 {
-                    "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
                     "rel": "bookmark"
                 }
             ]
diff --git a/doc/v3/api_samples/os-extended-availability-zone/servers-detail-resp.json b/doc/v3/api_samples/os-extended-availability-zone/servers-detail-resp.json
index 9563a0acde68..de70fcee6e83 100644
--- a/doc/v3/api_samples/os-extended-availability-zone/servers-detail-resp.json
+++ b/doc/v3/api_samples/os-extended-availability-zone/servers-detail-resp.json
@@ -21,13 +21,13 @@
                     }
                 ]
             },
-            "host_id": "cf5540800371e53064a60b36ff9d6d1d6a8719ffc870c63a270c6bee",
+            "hostId": "cf5540800371e53064a60b36ff9d6d1d6a8719ffc870c63a270c6bee",
             "id": "55f43fa2-dc7c-4c0b-b21a-76f9abe516f9",
             "image": {
                 "id": "70a599e0-31e7-49b7-b260-868f441e862b",
                 "links": [
                     {
-                        "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                        "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
                         "rel": "bookmark"
                     }
                 ]
diff --git a/doc/v3/api_samples/os-extended-server-attributes/server-get-resp.json b/doc/v3/api_samples/os-extended-server-attributes/server-get-resp.json
index 24c54d9c5d81..34f9a0b788cc 100644
--- a/doc/v3/api_samples/os-extended-server-attributes/server-get-resp.json
+++ b/doc/v3/api_samples/os-extended-server-attributes/server-get-resp.json
@@ -20,13 +20,13 @@
                 }
             ]
         },
-        "host_id": "3bf189131c61d0e71b0a8686a897a0f50d1693b48c47b721fe77155b",
+        "hostId": "3bf189131c61d0e71b0a8686a897a0f50d1693b48c47b721fe77155b",
         "id": "c278163e-36f9-4cf2-b1ac-80db4c63f7a8",
         "image": {
             "id": "70a599e0-31e7-49b7-b260-868f441e862b",
             "links": [
                 {
-                    "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
                     "rel": "bookmark"
                 }
             ]
diff --git a/doc/v3/api_samples/os-extended-server-attributes/servers-detail-resp.json b/doc/v3/api_samples/os-extended-server-attributes/servers-detail-resp.json
index 7236315943a3..961448ad02e3 100644
--- a/doc/v3/api_samples/os-extended-server-attributes/servers-detail-resp.json
+++ b/doc/v3/api_samples/os-extended-server-attributes/servers-detail-resp.json
@@ -21,13 +21,13 @@
                     }
                 ]
             },
-            "host_id": "63cf07a9fd82e1d2294926ec5c0d2e1e0ca449224246df75e16f23dc",
+            "hostId": "63cf07a9fd82e1d2294926ec5c0d2e1e0ca449224246df75e16f23dc",
             "id": "a8c1c13d-ec7e-47c7-b4ff-077f72c1ca46",
             "image": {
                 "id": "70a599e0-31e7-49b7-b260-868f441e862b",
                 "links": [
                     {
-                        "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                        "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
                         "rel": "bookmark"
                     }
                 ]
diff --git a/doc/v3/api_samples/os-extended-status/server-get-resp.json b/doc/v3/api_samples/os-extended-status/server-get-resp.json
index 640209494959..a4fc6b56baad 100644
--- a/doc/v3/api_samples/os-extended-status/server-get-resp.json
+++ b/doc/v3/api_samples/os-extended-status/server-get-resp.json
@@ -20,13 +20,13 @@
                 }
             ]
         },
-        "host_id": "46d2aa2d637bd55606304b611a1928627ee1278c149aef2206268d6e",
+        "hostId": "46d2aa2d637bd55606304b611a1928627ee1278c149aef2206268d6e",
         "id": "a868cb5e-c794-47bf-9cd8-e302b72bb94b",
         "image": {
             "id": "70a599e0-31e7-49b7-b260-868f441e862b",
             "links": [
                 {
-                    "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
                     "rel": "bookmark"
                 }
             ]
diff --git a/doc/v3/api_samples/os-extended-status/servers-detail-resp.json b/doc/v3/api_samples/os-extended-status/servers-detail-resp.json
index 77fd2afa728c..8d2f22bf8cc5 100644
--- a/doc/v3/api_samples/os-extended-status/servers-detail-resp.json
+++ b/doc/v3/api_samples/os-extended-status/servers-detail-resp.json
@@ -21,13 +21,13 @@
                     }
                 ]
             },
-            "host_id": "a275e77473e464558c4aba0d68e1914d1164e7ee2f69affde7aaae2b",
+            "hostId": "a275e77473e464558c4aba0d68e1914d1164e7ee2f69affde7aaae2b",
             "id": "6c8b5385-e74c-4fd5-add6-2fcf42d74a98",
             "image": {
                 "id": "70a599e0-31e7-49b7-b260-868f441e862b",
                 "links": [
                     {
-                        "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                        "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
                         "rel": "bookmark"
                     }
                 ]
diff --git a/doc/v3/api_samples/os-extended-volumes/server-get-resp.json b/doc/v3/api_samples/os-extended-volumes/server-get-resp.json
index 9f972cb8d177..973c4d40bcb1 100644
--- a/doc/v3/api_samples/os-extended-volumes/server-get-resp.json
+++ b/doc/v3/api_samples/os-extended-volumes/server-get-resp.json
@@ -20,13 +20,13 @@
                 }
             ]
         },
-        "host_id": "8feef92e2152b9970b51dbdade024afbec7f8f03daf7cb335a3c1cb9",
+        "hostId": "8feef92e2152b9970b51dbdade024afbec7f8f03daf7cb335a3c1cb9",
         "id": "7d62983e-23df-4320-bc89-bbc77f2a2e40",
         "image": {
             "id": "70a599e0-31e7-49b7-b260-868f441e862b",
             "links": [
                 {
-                    "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
                     "rel": "bookmark"
                 }
             ]
diff --git a/doc/v3/api_samples/os-extended-volumes/servers-detail-resp.json b/doc/v3/api_samples/os-extended-volumes/servers-detail-resp.json
index e03394fcd387..762de50de176 100644
--- a/doc/v3/api_samples/os-extended-volumes/servers-detail-resp.json
+++ b/doc/v3/api_samples/os-extended-volumes/servers-detail-resp.json
@@ -21,13 +21,13 @@
                     }
                 ]
             },
-            "host_id": "f9622ec1b5ab6e3785661ea1c1e0294f95aecbcf27ac4cb60b06bd02",
+            "hostId": "f9622ec1b5ab6e3785661ea1c1e0294f95aecbcf27ac4cb60b06bd02",
             "id": "8e479732-7701-48cd-af7a-04d84f51b742",
             "image": {
                 "id": "70a599e0-31e7-49b7-b260-868f441e862b",
                 "links": [
                     {
-                        "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                        "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
                         "rel": "bookmark"
                     }
                 ]
diff --git a/doc/v3/api_samples/os-hide-server-addresses/server-get-resp.json b/doc/v3/api_samples/os-hide-server-addresses/server-get-resp.json
index 15c89f5499ec..7ee75f9dc655 100644
--- a/doc/v3/api_samples/os-hide-server-addresses/server-get-resp.json
+++ b/doc/v3/api_samples/os-hide-server-addresses/server-get-resp.json
@@ -11,13 +11,13 @@
                 }
             ]
         },
-        "host_id": "d0635823e9162b22b90ff103f0c30f129bacf6ffb72f4d6fde87e738",
+        "hostId": "d0635823e9162b22b90ff103f0c30f129bacf6ffb72f4d6fde87e738",
         "id": "4bdee8c7-507f-40f2-8429-d301edd3791b",
         "image": {
             "id": "70a599e0-31e7-49b7-b260-868f441e862b",
             "links": [
                 {
-                    "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
                     "rel": "bookmark"
                 }
             ]
diff --git a/doc/v3/api_samples/os-hide-server-addresses/servers-details-resp.json b/doc/v3/api_samples/os-hide-server-addresses/servers-details-resp.json
index 6a911ccd0413..135a34860bf9 100644
--- a/doc/v3/api_samples/os-hide-server-addresses/servers-details-resp.json
+++ b/doc/v3/api_samples/os-hide-server-addresses/servers-details-resp.json
@@ -12,13 +12,13 @@
                     }
                 ]
             },
-            "host_id": "a4fa72ae8741e5e18fb062c15657b8f689b8da2837b734c61fc9eedd",
+            "hostId": "a4fa72ae8741e5e18fb062c15657b8f689b8da2837b734c61fc9eedd",
             "id": "a747eac1-e3ed-446c-935a-c2a2853f919c",
             "image": {
                 "id": "70a599e0-31e7-49b7-b260-868f441e862b",
                 "links": [
                     {
-                        "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                        "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
                         "rel": "bookmark"
                     }
                 ]
diff --git a/doc/v3/api_samples/os-pci/server-get-resp.json b/doc/v3/api_samples/os-pci/server-get-resp.json
index a58574e62858..f517aefbb465 100644
--- a/doc/v3/api_samples/os-pci/server-get-resp.json
+++ b/doc/v3/api_samples/os-pci/server-get-resp.json
@@ -20,13 +20,13 @@
                 }
             ]
         },
-        "host_id": "b7e88944272df30c113572778bcf5527f02e9c2a745221214536c1a2",
+        "hostId": "b7e88944272df30c113572778bcf5527f02e9c2a745221214536c1a2",
         "id": "9dafa6bc-7a9f-45b2-8177-11800ceb7224",
         "image": {
             "id": "70a599e0-31e7-49b7-b260-868f441e862b",
             "links": [
                 {
-                    "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
                     "rel": "bookmark"
                 }
             ]
diff --git a/doc/v3/api_samples/os-pci/servers-detail-resp.json b/doc/v3/api_samples/os-pci/servers-detail-resp.json
index f38922f3d112..872a5335f061 100644
--- a/doc/v3/api_samples/os-pci/servers-detail-resp.json
+++ b/doc/v3/api_samples/os-pci/servers-detail-resp.json
@@ -21,13 +21,13 @@
                     }
                 ]
             },
-            "host_id": "416f83c758ea0f9271018b278a9dcedb91b1190deaa598704b87219b",
+            "hostId": "416f83c758ea0f9271018b278a9dcedb91b1190deaa598704b87219b",
             "id": "ef440f98-04e8-46ea-ae74-e24d437040ea",
             "image": {
                 "id": "70a599e0-31e7-49b7-b260-868f441e862b",
                 "links": [
                     {
-                        "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                        "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
                         "rel": "bookmark"
                     }
                 ]
diff --git a/doc/v3/api_samples/os-rescue/server-get-resp-rescue.json b/doc/v3/api_samples/os-rescue/server-get-resp-rescue.json
index 1fa15ecfc96a..4df7a7cb8925 100644
--- a/doc/v3/api_samples/os-rescue/server-get-resp-rescue.json
+++ b/doc/v3/api_samples/os-rescue/server-get-resp-rescue.json
@@ -20,13 +20,13 @@
                 }
             ]
         },
-        "host_id": "f04994c5b4aac1cacbb83b09c2506e457d97dd54f620961624574690",
+        "hostId": "f04994c5b4aac1cacbb83b09c2506e457d97dd54f620961624574690",
         "id": "2fd0c66b-50af-41d2-9253-9fa41e7e8dd8",
         "image": {
             "id": "70a599e0-31e7-49b7-b260-868f441e862b",
             "links": [
                 {
-                    "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
                     "rel": "bookmark"
                 }
             ]
diff --git a/doc/v3/api_samples/os-rescue/server-get-resp-unrescue.json b/doc/v3/api_samples/os-rescue/server-get-resp-unrescue.json
index ebed3eeb8d07..79ea58d3cebb 100644
--- a/doc/v3/api_samples/os-rescue/server-get-resp-unrescue.json
+++ b/doc/v3/api_samples/os-rescue/server-get-resp-unrescue.json
@@ -20,13 +20,13 @@
                 }
             ]
         },
-        "host_id": "53cd4520a6cc639eeabcae4a0512b93e4675d431002e0b60e2dcfc04",
+        "hostId": "53cd4520a6cc639eeabcae4a0512b93e4675d431002e0b60e2dcfc04",
         "id": "edfc3905-1f3c-4819-8fc3-a7d8131cfa22",
         "image": {
             "id": "70a599e0-31e7-49b7-b260-868f441e862b",
             "links": [
                 {
-                    "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
                     "rel": "bookmark"
                 }
             ]
diff --git a/doc/v3/api_samples/os-security-groups/server-get-resp.json b/doc/v3/api_samples/os-security-groups/server-get-resp.json
index c25a140d2a4b..9993ae9b780a 100644
--- a/doc/v3/api_samples/os-security-groups/server-get-resp.json
+++ b/doc/v3/api_samples/os-security-groups/server-get-resp.json
@@ -20,13 +20,13 @@
                 }
             ]
         },
-        "host_id": "0e312d6763795d572ccd716973fd078290d9ec446517b222d3395660",
+        "hostId": "0e312d6763795d572ccd716973fd078290d9ec446517b222d3395660",
         "id": "f6961f7a-0133-4f27-94cd-901dca4ba426",
         "image": {
             "id": "70a599e0-31e7-49b7-b260-868f441e862b",
             "links": [
                 {
-                    "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
                     "rel": "bookmark"
                 }
             ]
diff --git a/doc/v3/api_samples/os-security-groups/servers-detail-resp.json b/doc/v3/api_samples/os-security-groups/servers-detail-resp.json
index 49463446ef69..435bbd145d71 100644
--- a/doc/v3/api_samples/os-security-groups/servers-detail-resp.json
+++ b/doc/v3/api_samples/os-security-groups/servers-detail-resp.json
@@ -21,13 +21,13 @@
                     }
                 ]
             },
-            "host_id": "afeeb125d4d37d0a2123e3144a20a6672fda5d4b6cb85ec193430d82",
+            "hostId": "afeeb125d4d37d0a2123e3144a20a6672fda5d4b6cb85ec193430d82",
             "id": "1b94e3fc-1b1c-431a-a077-6b280fb720ce",
             "image": {
                 "id": "70a599e0-31e7-49b7-b260-868f441e862b",
                 "links": [
                     {
-                        "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                        "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
                         "rel": "bookmark"
                     }
                 ]
diff --git a/doc/v3/api_samples/os-server-usage/server-get-resp.json b/doc/v3/api_samples/os-server-usage/server-get-resp.json
index 06f977d3c7a4..5f12283cc771 100644
--- a/doc/v3/api_samples/os-server-usage/server-get-resp.json
+++ b/doc/v3/api_samples/os-server-usage/server-get-resp.json
@@ -20,13 +20,13 @@
                 }
             ]
         },
-        "host_id": "73cf3a40601b63f5992894be2daa3712dd599d1c919984951e21edda",
+        "hostId": "73cf3a40601b63f5992894be2daa3712dd599d1c919984951e21edda",
         "id": "cee6d136-e378-4cfc-9eec-71797f025991",
         "image": {
             "id": "70a599e0-31e7-49b7-b260-868f441e862b",
             "links": [
                 {
-                    "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
                     "rel": "bookmark"
                 }
             ]
diff --git a/doc/v3/api_samples/os-server-usage/servers-detail-resp.json b/doc/v3/api_samples/os-server-usage/servers-detail-resp.json
index ad4008e90b5b..d917fdb3f2b9 100644
--- a/doc/v3/api_samples/os-server-usage/servers-detail-resp.json
+++ b/doc/v3/api_samples/os-server-usage/servers-detail-resp.json
@@ -21,13 +21,13 @@
                     }
                 ]
             },
-            "host_id": "117535ce0eda7ee02ebffe2c976173629385481ae3f2bded5e14a66b",
+            "hostId": "117535ce0eda7ee02ebffe2c976173629385481ae3f2bded5e14a66b",
             "id": "ae114799-9164-48f5-a036-6ef9310acbc4",
             "image": {
                 "id": "70a599e0-31e7-49b7-b260-868f441e862b",
                 "links": [
                     {
-                        "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                        "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
                         "rel": "bookmark"
                     }
                 ]
diff --git a/doc/v3/api_samples/servers/server-action-rebuild-resp.json b/doc/v3/api_samples/servers/server-action-rebuild-resp.json
index abb6dfff8862..4c38ad2f8b50 100644
--- a/doc/v3/api_samples/servers/server-action-rebuild-resp.json
+++ b/doc/v3/api_samples/servers/server-action-rebuild-resp.json
@@ -21,13 +21,13 @@
                 }
             ]
         },
-        "host_id": "28d8d56f0e3a77e20891f455721cbb68032e017045e20aa5dfc6cb66",
+        "hostId": "28d8d56f0e3a77e20891f455721cbb68032e017045e20aa5dfc6cb66",
         "id": "a0a80a94-3d81-4a10-822a-daa0cf9e870b",
         "image": {
             "id": "70a599e0-31e7-49b7-b260-868f441e862b",
             "links": [
                 {
-                    "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
                     "rel": "bookmark"
                 }
             ]
diff --git a/doc/v3/api_samples/servers/server-get-resp.json b/doc/v3/api_samples/servers/server-get-resp.json
index 03ec3a924598..fa7708f1775d 100644
--- a/doc/v3/api_samples/servers/server-get-resp.json
+++ b/doc/v3/api_samples/servers/server-get-resp.json
@@ -20,13 +20,13 @@
                 }
             ]
         },
-        "host_id": "92154fab69d5883ba2c8622b7e65f745dd33257221c07af363c51b29",
+        "hostId": "92154fab69d5883ba2c8622b7e65f745dd33257221c07af363c51b29",
         "id": "0e44cc9c-e052-415d-afbf-469b0d384170",
         "image": {
             "id": "70a599e0-31e7-49b7-b260-868f441e862b",
             "links": [
                 {
-                    "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
                     "rel": "bookmark"
                 }
             ]
diff --git a/doc/v3/api_samples/servers/servers-details-resp.json b/doc/v3/api_samples/servers/servers-details-resp.json
index f478ac8fa7d3..6644953453f5 100644
--- a/doc/v3/api_samples/servers/servers-details-resp.json
+++ b/doc/v3/api_samples/servers/servers-details-resp.json
@@ -21,13 +21,13 @@
                     }
                 ]
             },
-            "host_id": "bcf92836fc9ed4203a75cb0337afc7f917d2be504164b995c2334b25",
+            "hostId": "bcf92836fc9ed4203a75cb0337afc7f917d2be504164b995c2334b25",
             "id": "f5dc173b-6804-445a-a6d8-c705dad5b5eb",
             "image": {
                 "id": "70a599e0-31e7-49b7-b260-868f441e862b",
                 "links": [
                     {
-                        "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                        "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
                         "rel": "bookmark"
                     }
                 ]
diff --git a/nova/api/openstack/compute/views/images.py b/nova/api/openstack/compute/views/images.py
index b6d735129f01..054fcfb1f8ef 100644
--- a/nova/api/openstack/compute/views/images.py
+++ b/nova/api/openstack/compute/views/images.py
@@ -147,20 +147,3 @@ class ViewBuilder(common.ViewBuilder):
             "saving": 50,
             "active": 100,
         }.get(image.get("status"), 0)
-
-
-class ViewBuilderV3(ViewBuilder):
-
-    def _get_bookmark_link(self, request, identifier, collection_name):
-        """Create a URL that refers to a specific resource."""
-        if collection_name == "images":
-            glance_url = glance.generate_image_url(identifier)
-            return self._update_glance_link_prefix(glance_url)
-        else:
-            raise NotImplementedError
-            # NOTE(cyeoh) The V3 version of _get_bookmark_link should
-            # only ever be called with images as the
-            # collection_name. The images API has been removed in the
-            # V3 API and the V3 version of the view only exists for
-            # the servers view to be able to generate the appropriate
-            # bookmark link for the image of the instance.
diff --git a/nova/api/openstack/compute/views/servers.py b/nova/api/openstack/compute/views/servers.py
index 6d97c369332a..621e9617c108 100644
--- a/nova/api/openstack/compute/views/servers.py
+++ b/nova/api/openstack/compute/views/servers.py
@@ -241,7 +241,9 @@ class ViewBuilderV3(ViewBuilder):
         """Initialize view builder."""
         super(ViewBuilderV3, self).__init__()
         self._address_builder = views_addresses.ViewBuilderV3()
-        self._image_builder = views_images.ViewBuilderV3()
+        # TODO(alex_xu): In V3 API, we correct the image bookmark link to
+        # use glance endpoint. We revert back it to use nova endpoint for v2.1.
+        self._image_builder = views_images.ViewBuilder()
 
     def show(self, request, instance):
         """Detailed view of a single instance."""
@@ -253,7 +255,10 @@ class ViewBuilderV3(ViewBuilder):
                 "tenant_id": instance.get("project_id") or "",
                 "user_id": instance.get("user_id") or "",
                 "metadata": self._get_metadata(instance),
-                "host_id": self._get_host_id(instance) or "",
+                "hostId": self._get_host_id(instance) or "",
+                # TODO(alex_xu): '_get_image' return {} when there image_ref
+                # isn't existed in V3 API, we revert it back to return "" in
+                # V2.1.
                 "image": self._get_image(request, instance),
                 "flavor": self._get_flavor(request, instance),
                 "created": timeutils.isotime(instance["created_at"]),
@@ -272,7 +277,4 @@ class ViewBuilderV3(ViewBuilder):
         if server["server"]["status"] in self._progress_statuses:
             server["server"]["progress"] = instance.get("progress", 0)
 
-        # We should modify the "image" to empty dictionary
-        if not server["server"]["image"]:
-            server["server"]["image"] = {}
         return server
diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_servers.py b/nova/tests/api/openstack/compute/plugins/v3/test_servers.py
index 3aff6f5c68d3..456b2b8e39a7 100644
--- a/nova/tests/api/openstack/compute/plugins/v3/test_servers.py
+++ b/nova/tests/api/openstack/compute/plugins/v3/test_servers.py
@@ -302,8 +302,8 @@ class ServersControllerTest(ControllerTest):
         server1 = self.controller.show(req, FAKE_UUID)
         server2 = self.controller.show(req, FAKE_UUID)
 
-        self.assertNotEqual(server1['server']['host_id'],
-                            server2['server']['host_id'])
+        self.assertNotEqual(server1['server']['hostId'],
+                            server2['server']['hostId'])
 
     def _get_server_data_dict(self, uuid, image_bookmark, flavor_bookmark,
                               status="ACTIVE", progress=100):
@@ -317,7 +317,7 @@ class ServersControllerTest(ControllerTest):
                 "progress": progress,
                 "name": "server1",
                 "status": status,
-                "host_id": '',
+                "hostId": '',
                 "image": {
                     "id": "10",
                     "links": [
@@ -362,7 +362,7 @@ class ServersControllerTest(ControllerTest):
 
     def test_get_server_by_id(self):
         self.flags(use_ipv6=True)
-        image_bookmark = "http://localhost:9292/images/10"
+        image_bookmark = "http://localhost/images/10"
         flavor_bookmark = "http://localhost/flavors/1"
 
         uuid = FAKE_UUID
@@ -378,7 +378,7 @@ class ServersControllerTest(ControllerTest):
         self.assertThat(res_dict, matchers.DictMatches(expected_server))
 
     def test_get_server_with_active_status_by_id(self):
-        image_bookmark = "http://localhost:9292/images/10"
+        image_bookmark = "http://localhost/images/10"
         flavor_bookmark = "http://localhost/flavors/1"
 
         new_return_server = fakes.fake_instance_get(
@@ -395,7 +395,7 @@ class ServersControllerTest(ControllerTest):
 
     def test_get_server_with_id_image_ref_by_id(self):
         image_ref = "10"
-        image_bookmark = "http://localhost:9292/images/10"
+        image_bookmark = "http://localhost/images/10"
         flavor_id = "1"
         flavor_bookmark = "http://localhost/flavors/1"
 
@@ -1225,7 +1225,7 @@ class ServersControllerTest(ControllerTest):
             "links": [
                 {
                     "rel": "bookmark",
-                    "href": 'http://localhost:9292/images/10',
+                    "href": 'http://localhost/images/10',
                     },
                 ],
             }
@@ -1234,7 +1234,7 @@ class ServersControllerTest(ControllerTest):
 
         for i, s in enumerate(res_dict['servers']):
             self.assertEqual(s['id'], fakes.get_fake_uuid(i))
-            self.assertEqual(s['host_id'], '')
+            self.assertEqual(s['hostId'], '')
             self.assertEqual(s['name'], 'server%d' % (i + 1))
             self.assertEqual(s['image'], expected_image)
             self.assertEqual(s['flavor'], expected_flavor)
@@ -1243,8 +1243,8 @@ class ServersControllerTest(ControllerTest):
 
     def test_get_all_server_details_with_host(self):
         """We want to make sure that if two instances are on the same host,
-        then they return the same host_id. If two instances are on different
-        hosts, they should return different host_ids. In this test,
+        then they return the same hostId. If two instances are on different
+        hosts, they should return different hostIds. In this test,
         there are 5 instances - 2 on one host and 3 on another.
         """
 
@@ -1260,13 +1260,13 @@ class ServersControllerTest(ControllerTest):
         res_dict = self.controller.detail(req)
 
         server_list = res_dict['servers']
-        host_ids = [server_list[0]['host_id'], server_list[1]['host_id']]
+        host_ids = [server_list[0]['hostId'], server_list[1]['hostId']]
         self.assertTrue(host_ids[0] and host_ids[1])
         self.assertNotEqual(host_ids[0], host_ids[1])
 
         for i, s in enumerate(server_list):
             self.assertEqual(s['id'], fakes.get_fake_uuid(i))
-            self.assertEqual(s['host_id'], host_ids[i % 2])
+            self.assertEqual(s['hostId'], host_ids[i % 2])
             self.assertEqual(s['name'], 'server%d' % (i + 1))
 
     def test_get_servers_joins_pci_devices(self):
@@ -2676,7 +2676,7 @@ class ServersViewBuilderTest(test.TestCase):
         self.assertThat(output, matchers.DictMatches(expected_server))
 
     def test_build_server_detail(self):
-        image_bookmark = "http://localhost:9292/images/5"
+        image_bookmark = "http://localhost/images/5"
         flavor_bookmark = "http://localhost/flavors/1"
         self_link = "http://localhost/v3/servers/%s" % self.uuid
         bookmark_link = "http://localhost/servers/%s" % self.uuid
@@ -2690,7 +2690,7 @@ class ServersViewBuilderTest(test.TestCase):
                 "progress": 0,
                 "name": "test_server",
                 "status": "BUILD",
-                "host_id": '',
+                "hostId": '',
                 "image": {
                     "id": "5",
                     "links": [
@@ -2734,17 +2734,12 @@ class ServersViewBuilderTest(test.TestCase):
         output = self.view_builder.show(self.request, self.instance)
         self.assertThat(output, matchers.DictMatches(expected_server))
 
-    def test_build_server_no_image(self):
-        self.instance["image_ref"] = ""
-        output = self.view_builder.show(self.request, self.instance)
-        self.assertEqual(output['server']['image'], {})
-
     def test_build_server_detail_with_fault(self):
         self.instance['vm_state'] = vm_states.ERROR
         self.instance['fault'] = fake_instance.fake_fault_obj(
                                      self.request.context, self.uuid)
 
-        image_bookmark = "http://localhost:9292/images/5"
+        image_bookmark = "http://localhost/images/5"
         flavor_bookmark = "http://localhost/flavors/1"
         self_link = "http://localhost/v3/servers/%s" % self.uuid
         bookmark_link = "http://localhost/servers/%s" % self.uuid
@@ -2757,7 +2752,7 @@ class ServersViewBuilderTest(test.TestCase):
                 "created": "2010-10-10T12:00:00Z",
                 "name": "test_server",
                 "status": "ERROR",
-                "host_id": '',
+                "hostId": '',
                 "image": {
                     "id": "5",
                     "links": [
@@ -2893,7 +2888,7 @@ class ServersViewBuilderTest(test.TestCase):
         # set the power state of the instance to running
         self.instance['vm_state'] = vm_states.ACTIVE
         self.instance['progress'] = 100
-        image_bookmark = "http://localhost:9292/images/5"
+        image_bookmark = "http://localhost/images/5"
         flavor_bookmark = "http://localhost/flavors/1"
         self_link = "http://localhost/v3/servers/%s" % self.uuid
         bookmark_link = "http://localhost/servers/%s" % self.uuid
@@ -2907,7 +2902,7 @@ class ServersViewBuilderTest(test.TestCase):
                 "progress": 100,
                 "name": "test_server",
                 "status": "ACTIVE",
-                "host_id": '',
+                "hostId": '',
                 "image": {
                     "id": "5",
                     "links": [
@@ -2958,7 +2953,7 @@ class ServersViewBuilderTest(test.TestCase):
         metadata = nova_utils.metadata_to_dict(metadata)
         self.instance['metadata'] = metadata
 
-        image_bookmark = "http://localhost:9292/images/5"
+        image_bookmark = "http://localhost/images/5"
         flavor_bookmark = "http://localhost/flavors/1"
         self_link = "http://localhost/v3/servers/%s" % self.uuid
         bookmark_link = "http://localhost/servers/%s" % self.uuid
@@ -2972,7 +2967,7 @@ class ServersViewBuilderTest(test.TestCase):
                 "progress": 0,
                 "name": "test_server",
                 "status": "BUILD",
-                "host_id": '',
+                "hostId": '',
                 "image": {
                     "id": "5",
                     "links": [
diff --git a/nova/tests/integrated/v3/api_samples/all_extensions/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/all_extensions/server-get-resp.json.tpl
index e00029691071..8a4b71db8cf9 100644
--- a/nova/tests/integrated/v3/api_samples/all_extensions/server-get-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/all_extensions/server-get-resp.json.tpl
@@ -22,13 +22,13 @@
                 }
             ]
         },
-        "host_id": "%(hostid)s",
+        "hostId": "%(hostid)s",
         "id": "%(id)s",
         "image": {
             "id": "%(uuid)s",
             "links": [
                 {
-                    "href": "%(glance_host)s/images/%(uuid)s",
+                    "href": "%(host)s/images/%(uuid)s",
                     "rel": "bookmark"
                 }
             ]
diff --git a/nova/tests/integrated/v3/api_samples/all_extensions/servers-details-resp.json.tpl b/nova/tests/integrated/v3/api_samples/all_extensions/servers-details-resp.json.tpl
index 652714cf0f27..bc4ae2426d89 100644
--- a/nova/tests/integrated/v3/api_samples/all_extensions/servers-details-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/all_extensions/servers-details-resp.json.tpl
@@ -23,13 +23,13 @@
                     }
                 ]
             },
-            "host_id": "%(hostid)s",
+            "hostId": "%(hostid)s",
             "id": "%(id)s",
             "image": {
                 "id": "%(uuid)s",
                 "links": [
                     {
-                        "href": "%(glance_host)s/images/%(uuid)s",
+                        "href": "%(host)s/images/%(uuid)s",
                         "rel": "bookmark"
                     }
                 ]
diff --git a/nova/tests/integrated/v3/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl
index 7f9a09d0df5e..bb115f6085c4 100644
--- a/nova/tests/integrated/v3/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl
@@ -21,13 +21,13 @@
                 }
             ]
         },
-        "host_id": "%(hostid)s",
+        "hostId": "%(hostid)s",
         "id": "%(uuid)s",
         "image": {
             "id": "%(image_id)s",
             "links": [
                 {
-                    "href": "%(glance_host)s/images/%(image_id)s",
+                    "href": "%(host)s/images/%(image_id)s",
                     "rel": "bookmark"
                 }
             ]
diff --git a/nova/tests/integrated/v3/api_samples/os-access-ips/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-access-ips/server-get-resp.json.tpl
index 24b097f18f25..9454f2be6d61 100644
--- a/nova/tests/integrated/v3/api_samples/os-access-ips/server-get-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-access-ips/server-get-resp.json.tpl
@@ -22,13 +22,13 @@
                 }
             ]
         },
-        "host_id": "%(hostid)s",
+        "hostId": "%(hostid)s",
         "id": "%(id)s",
         "image": {
             "id": "%(uuid)s",
             "links": [
                 {
-                    "href": "%(glance_host)s/images/%(uuid)s",
+                    "href": "%(host)s/images/%(uuid)s",
                     "rel": "bookmark"
                 }
             ]
diff --git a/nova/tests/integrated/v3/api_samples/os-access-ips/server-put-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-access-ips/server-put-resp.json.tpl
index 925a162c302f..7e4d0dd7aad2 100644
--- a/nova/tests/integrated/v3/api_samples/os-access-ips/server-put-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-access-ips/server-put-resp.json.tpl
@@ -22,13 +22,13 @@
                 }
             ]
         },
-        "host_id": "%(hostid)s",
+        "hostId": "%(hostid)s",
         "id": "%(id)s",
         "image": {
             "id": "%(uuid)s",
             "links": [
                 {
-                    "href": "%(glance_host)s/images/%(uuid)s",
+                    "href": "%(host)s/images/%(uuid)s",
                     "rel": "bookmark"
                 }
             ]
diff --git a/nova/tests/integrated/v3/api_samples/os-access-ips/servers-details-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-access-ips/servers-details-resp.json.tpl
index 7a14faf6f069..447fa00500e4 100644
--- a/nova/tests/integrated/v3/api_samples/os-access-ips/servers-details-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-access-ips/servers-details-resp.json.tpl
@@ -23,13 +23,13 @@
                     }
                 ]
             },
-            "host_id": "%(hostid)s",
+            "hostId": "%(hostid)s",
             "id": "%(id)s",
             "image": {
                 "id": "%(uuid)s",
                 "links": [
                     {
-                        "href": "%(glance_host)s/images/%(uuid)s",
+                        "href": "%(host)s/images/%(uuid)s",
                         "rel": "bookmark"
                     }
                 ]
diff --git a/nova/tests/integrated/v3/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl
index 13f51f58753d..a7a42de048f5 100644
--- a/nova/tests/integrated/v3/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl
@@ -21,13 +21,13 @@
                 }
             ]
         },
-        "host_id": "%(hostid)s",
+        "hostId": "%(hostid)s",
         "id": "%(id)s",
         "image": {
             "id": "%(uuid)s",
             "links": [
                 {
-                    "href": "%(glance_host)s/images/%(uuid)s",
+                    "href": "%(host)s/images/%(uuid)s",
                     "rel": "bookmark"
                 }
             ]
diff --git a/nova/tests/integrated/v3/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl
index cc7fe80d46f4..65a1bd1f9999 100644
--- a/nova/tests/integrated/v3/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl
@@ -22,13 +22,13 @@
                     }
                 ]
             },
-            "host_id": "%(hostid)s",
+            "hostId": "%(hostid)s",
             "id": "%(id)s",
             "image": {
                 "id": "%(uuid)s",
                 "links": [
                     {
-                        "href": "%(glance_host)s/images/%(uuid)s",
+                        "href": "%(host)s/images/%(uuid)s",
                         "rel": "bookmark"
                     }
                 ]
diff --git a/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/server-get-resp.json.tpl
index e9852475e093..a835dbf54fbc 100644
--- a/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/server-get-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/server-get-resp.json.tpl
@@ -22,13 +22,13 @@
                 }
             ]
         },
-        "host_id": "%(hostid)s",
+        "hostId": "%(hostid)s",
         "id": "%(uuid)s",
         "image": {
             "id": "%(uuid)s",
             "links": [
                 {
-                    "href": "%(glance_host)s/images/%(uuid)s",
+                    "href": "%(host)s/images/%(uuid)s",
                     "rel": "bookmark"
                 }
             ]
diff --git a/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/servers-detail-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/servers-detail-resp.json.tpl
index 1d69092b0956..2d2b4a8c1b21 100644
--- a/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/servers-detail-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/servers-detail-resp.json.tpl
@@ -23,13 +23,13 @@
                     }
                 ]
             },
-            "host_id": "%(hostid)s",
+            "hostId": "%(hostid)s",
             "id": "%(uuid)s",
             "image": {
                 "id": "%(uuid)s",
                 "links": [
                     {
-                        "href": "%(glance_host)s/images/%(uuid)s",
+                        "href": "%(host)s/images/%(uuid)s",
                         "rel": "bookmark"
                     }
                 ]
diff --git a/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/server-get-resp.json.tpl
index acb0ed6c3d54..6a2cc3152b43 100644
--- a/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/server-get-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/server-get-resp.json.tpl
@@ -24,13 +24,13 @@
                 }
             ]
         },
-        "host_id": "%(hostid)s",
+        "hostId": "%(hostid)s",
         "id": "%(uuid)s",
         "image": {
             "id": "%(uuid)s",
             "links": [
                 {
-                    "href": "%(glance_host)s/images/%(uuid)s",
+                    "href": "%(host)s/images/%(uuid)s",
                     "rel": "bookmark"
                 }
             ]
diff --git a/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/servers-detail-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/servers-detail-resp.json.tpl
index 115bba4df428..88a3fda9d584 100644
--- a/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/servers-detail-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/servers-detail-resp.json.tpl
@@ -25,13 +25,13 @@
                     }
                 ]
             },
-            "host_id": "%(hostid)s",
+            "hostId": "%(hostid)s",
             "id": "%(uuid)s",
             "image": {
                 "id": "%(uuid)s",
                 "links": [
                     {
-                        "href": "%(glance_host)s/images/%(uuid)s",
+                        "href": "%(host)s/images/%(uuid)s",
                         "rel": "bookmark"
                     }
                 ]
diff --git a/nova/tests/integrated/v3/api_samples/os-extended-status/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-extended-status/server-get-resp.json.tpl
index a416cc6fc562..faaa83f54a83 100644
--- a/nova/tests/integrated/v3/api_samples/os-extended-status/server-get-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-extended-status/server-get-resp.json.tpl
@@ -25,13 +25,13 @@
                 }
             ]
         },
-        "host_id": "%(hostid)s",
+        "hostId": "%(hostid)s",
         "id": "%(uuid)s",
         "image": {
             "id": "%(uuid)s",
             "links": [
                 {
-                    "href": "%(glance_host)s/images/%(uuid)s",
+                    "href": "%(host)s/images/%(uuid)s",
                     "rel": "bookmark"
                 }
             ]
diff --git a/nova/tests/integrated/v3/api_samples/os-extended-status/servers-detail-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-extended-status/servers-detail-resp.json.tpl
index 06eb48826272..decce080ebf0 100644
--- a/nova/tests/integrated/v3/api_samples/os-extended-status/servers-detail-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-extended-status/servers-detail-resp.json.tpl
@@ -26,13 +26,13 @@
                     }
                 ]
             },
-            "host_id": "%(hostid)s",
+            "hostId": "%(hostid)s",
             "id": "%(uuid)s",
             "image": {
                 "id": "%(uuid)s",
                 "links": [
                     {
-                        "href": "%(glance_host)s/images/%(uuid)s",
+                        "href": "%(host)s/images/%(uuid)s",
                         "rel": "bookmark"
                     }
                 ]
diff --git a/nova/tests/integrated/v3/api_samples/os-extended-volumes/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-extended-volumes/server-get-resp.json.tpl
index b02b77b365f0..3b38100e5115 100644
--- a/nova/tests/integrated/v3/api_samples/os-extended-volumes/server-get-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-extended-volumes/server-get-resp.json.tpl
@@ -20,13 +20,13 @@
                 }
             ]
         },
-        "host_id": "%(hostid)s",
+        "hostId": "%(hostid)s",
         "id": "%(id)s",
         "image": {
             "id": "%(uuid)s",
             "links": [
                 {
-                    "href": "%(glance_host)s/images/%(uuid)s",
+                    "href": "%(host)s/images/%(uuid)s",
                     "rel": "bookmark"
                 }
             ]
diff --git a/nova/tests/integrated/v3/api_samples/os-extended-volumes/servers-detail-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-extended-volumes/servers-detail-resp.json.tpl
index 3d6b2301708e..e2561549a4b5 100644
--- a/nova/tests/integrated/v3/api_samples/os-extended-volumes/servers-detail-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-extended-volumes/servers-detail-resp.json.tpl
@@ -22,13 +22,13 @@
                     }
                 ]
             },
-            "host_id": "%(hostid)s",
+            "hostId": "%(hostid)s",
             "id": "%(uuid)s",
             "image": {
                 "id": "%(uuid)s",
                 "links": [
                     {
-                        "href": "%(glance_host)s/images/%(uuid)s",
+                        "href": "%(host)s/images/%(uuid)s",
                         "rel": "bookmark"
                     }
                 ]
diff --git a/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/server-get-resp.json.tpl
index ab38bd53f5ff..3a69fcd32151 100644
--- a/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/server-get-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/server-get-resp.json.tpl
@@ -12,13 +12,13 @@
                 }
             ]
         },
-        "host_id": "%(hostid)s",
+        "hostId": "%(hostid)s",
         "id": "%(id)s",
         "image": {
             "id": "%(uuid)s",
             "links": [
                 {
-                    "href": "%(glance_host)s/images/%(uuid)s",
+                    "href": "%(host)s/images/%(uuid)s",
                     "rel": "bookmark"
                 }
             ]
diff --git a/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl
index 185905c922c1..353d29f480f4 100644
--- a/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl
@@ -12,13 +12,13 @@
                     }
                 ]
             },
-            "host_id": "%(hostid)s",
+            "hostId": "%(hostid)s",
             "id": "%(id)s",
             "image": {
                 "id": "%(uuid)s",
                 "links": [
                     {
-                        "href": "%(glance_host)s/images/%(uuid)s",
+                        "href": "%(host)s/images/%(uuid)s",
                         "rel": "bookmark"
                     }
                 ]
diff --git a/nova/tests/integrated/v3/api_samples/os-pci/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-pci/server-get-resp.json.tpl
index 920f9c879220..84ad95035979 100644
--- a/nova/tests/integrated/v3/api_samples/os-pci/server-get-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-pci/server-get-resp.json.tpl
@@ -20,13 +20,13 @@
                 }
             ]
         },
-        "host_id":  "%(hostid)s",
+        "hostId":  "%(hostid)s",
         "id": "%(id)s",
         "image": {
             "id": "%(uuid)s",
             "links": [
                 {
-                    "href":  "%(glance_host)s/images/%(uuid)s",
+                    "href":  "%(host)s/images/%(uuid)s",
                     "rel": "bookmark"
                 }
             ]
diff --git a/nova/tests/integrated/v3/api_samples/os-pci/servers-detail-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-pci/servers-detail-resp.json.tpl
index 265045ff7b83..3b2a344d0cbc 100644
--- a/nova/tests/integrated/v3/api_samples/os-pci/servers-detail-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-pci/servers-detail-resp.json.tpl
@@ -21,13 +21,13 @@
                     }
                 ]
             },
-            "host_id": "%(hostid)s",
+            "hostId": "%(hostid)s",
             "id": "%(id)s",
             "image": {
                 "id": "%(uuid)s",
                 "links": [
                     {
-                        "href": "%(glance_host)s/images/%(uuid)s",
+                        "href": "%(host)s/images/%(uuid)s",
                         "rel": "bookmark"
                     }
                 ]
diff --git a/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-rescue.json.tpl b/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-rescue.json.tpl
index 7eae80526db6..a7fb13e958cb 100644
--- a/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-rescue.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-rescue.json.tpl
@@ -20,13 +20,13 @@
                 }
             ]
         },
-        "host_id": "%(hostid)s",
+        "hostId": "%(hostid)s",
         "id": "%(id)s",
         "image": {
             "id": "%(uuid)s",
             "links": [
                 {
-                    "href": "%(glance_host)s/images/%(uuid)s",
+                    "href": "%(host)s/images/%(uuid)s",
                     "rel": "bookmark"
                 }
             ]
diff --git a/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-unrescue.json.tpl b/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-unrescue.json.tpl
index e56a1a5d779e..e3c28e9de211 100644
--- a/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-unrescue.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-unrescue.json.tpl
@@ -20,13 +20,13 @@
                 }
             ]
         },
-        "host_id": "%(hostid)s",
+        "hostId": "%(hostid)s",
         "id": "%(id)s",
         "image": {
             "id": "%(uuid)s",
             "links": [
                 {
-                    "href": "%(glance_host)s/images/%(uuid)s",
+                    "href": "%(host)s/images/%(uuid)s",
                     "rel": "bookmark"
                 }
             ]
diff --git a/nova/tests/integrated/v3/api_samples/os-security-groups/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-security-groups/server-get-resp.json.tpl
index fc3bd9ea1db8..8c11a95a2454 100644
--- a/nova/tests/integrated/v3/api_samples/os-security-groups/server-get-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-security-groups/server-get-resp.json.tpl
@@ -20,13 +20,13 @@
                 }
             ]
         },
-        "host_id": "%(hostid)s",
+        "hostId": "%(hostid)s",
         "id": "%(id)s",
         "image": {
             "id": "%(uuid)s",
             "links": [
                 {
-                    "href": "%(glance_host)s/images/%(uuid)s",
+                    "href": "%(host)s/images/%(uuid)s",
                     "rel": "bookmark"
                 }
             ]
diff --git a/nova/tests/integrated/v3/api_samples/os-security-groups/servers-detail-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-security-groups/servers-detail-resp.json.tpl
index 3306b40a9c2b..37e4621c7339 100644
--- a/nova/tests/integrated/v3/api_samples/os-security-groups/servers-detail-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-security-groups/servers-detail-resp.json.tpl
@@ -22,13 +22,13 @@
                     }
                 ]
             },
-            "host_id": "%(hostid)s",
+            "hostId": "%(hostid)s",
             "id": "%(uuid)s",
             "image": {
                 "id": "%(uuid)s",
                 "links": [
                     {
-                        "href": "%(glance_host)s/images/%(uuid)s",
+                        "href": "%(host)s/images/%(uuid)s",
                         "rel": "bookmark"
                     }
                 ]
diff --git a/nova/tests/integrated/v3/api_samples/os-server-usage/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-server-usage/server-get-resp.json.tpl
index 67325562240d..7cc853f8fddb 100644
--- a/nova/tests/integrated/v3/api_samples/os-server-usage/server-get-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-server-usage/server-get-resp.json.tpl
@@ -22,13 +22,13 @@
                 }
             ]
         },
-        "host_id": "%(hostid)s",
+        "hostId": "%(hostid)s",
         "id": "%(id)s",
         "image": {
             "id": "%(uuid)s",
             "links": [
                 {
-                    "href": "%(glance_host)s/images/%(uuid)s",
+                    "href": "%(host)s/images/%(uuid)s",
                     "rel": "bookmark"
                 }
             ]
diff --git a/nova/tests/integrated/v3/api_samples/os-server-usage/servers-detail-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-server-usage/servers-detail-resp.json.tpl
index 1adbde9767f0..458276dc2960 100644
--- a/nova/tests/integrated/v3/api_samples/os-server-usage/servers-detail-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-server-usage/servers-detail-resp.json.tpl
@@ -32,7 +32,7 @@
                 "id": "%(uuid)s",
                 "links": [
                     {
-                        "href": "%(glance_host)s/images/%(uuid)s",
+                        "href": "%(host)s/images/%(uuid)s",
                         "rel": "bookmark"
                     }
                 ]
@@ -50,7 +50,7 @@
                     }
                 ]
             },
-            "host_id": "%(hostid)s",
+            "hostId": "%(hostid)s",
             "metadata": {
                 "My Server Name": "Apache1"
             }
diff --git a/nova/tests/integrated/v3/api_samples/servers/server-action-rebuild-preserve-ephemeral-resp.json.tpl b/nova/tests/integrated/v3/api_samples/servers/server-action-rebuild-preserve-ephemeral-resp.json.tpl
index 5802293c0482..8c8c124b0a0d 100644
--- a/nova/tests/integrated/v3/api_samples/servers/server-action-rebuild-preserve-ephemeral-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/servers/server-action-rebuild-preserve-ephemeral-resp.json.tpl
@@ -21,13 +21,13 @@
                 }
             ]
         },
-        "host_id": "%(hostid)s",
+        "hostId": "%(hostid)s",
         "id": "%(uuid)s",
         "image": {
             "id": "%(uuid)s",
             "links": [
                 {
-                    "href": "%(glance_host)s/images/%(uuid)s",
+                    "href": "%(host)s/images/%(uuid)s",
                     "rel": "bookmark"
                 }
             ]
diff --git a/nova/tests/integrated/v3/api_samples/servers/server-action-rebuild-resp.json.tpl b/nova/tests/integrated/v3/api_samples/servers/server-action-rebuild-resp.json.tpl
index 5802293c0482..8c8c124b0a0d 100644
--- a/nova/tests/integrated/v3/api_samples/servers/server-action-rebuild-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/servers/server-action-rebuild-resp.json.tpl
@@ -21,13 +21,13 @@
                 }
             ]
         },
-        "host_id": "%(hostid)s",
+        "hostId": "%(hostid)s",
         "id": "%(uuid)s",
         "image": {
             "id": "%(uuid)s",
             "links": [
                 {
-                    "href": "%(glance_host)s/images/%(uuid)s",
+                    "href": "%(host)s/images/%(uuid)s",
                     "rel": "bookmark"
                 }
             ]
diff --git a/nova/tests/integrated/v3/api_samples/servers/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/servers/server-get-resp.json.tpl
index 37cca80f1b99..b37fa3d12854 100644
--- a/nova/tests/integrated/v3/api_samples/servers/server-get-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/servers/server-get-resp.json.tpl
@@ -20,13 +20,13 @@
                 }
             ]
         },
-        "host_id": "%(hostid)s",
+        "hostId": "%(hostid)s",
         "id": "%(id)s",
         "image": {
             "id": "%(uuid)s",
             "links": [
                 {
-                    "href": "%(glance_host)s/images/%(uuid)s",
+                    "href": "%(host)s/images/%(uuid)s",
                     "rel": "bookmark"
                 }
             ]
diff --git a/nova/tests/integrated/v3/api_samples/servers/servers-details-resp.json.tpl b/nova/tests/integrated/v3/api_samples/servers/servers-details-resp.json.tpl
index c72018e1070a..a3d63d064f12 100644
--- a/nova/tests/integrated/v3/api_samples/servers/servers-details-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/servers/servers-details-resp.json.tpl
@@ -21,13 +21,13 @@
                     }
                 ]
             },
-            "host_id": "%(hostid)s",
+            "hostId": "%(hostid)s",
             "id": "%(id)s",
             "image": {
                 "id": "%(uuid)s",
                 "links": [
                     {
-                        "href": "%(glance_host)s/images/%(uuid)s",
+                        "href": "%(host)s/images/%(uuid)s",
                         "rel": "bookmark"
                     }
                 ]