diff --git a/doc/v3/api_samples/all_extensions/server-post-req.json b/doc/v3/api_samples/all_extensions/server-post-req.json
index d41985a1bc..2eedab6147 100644
--- a/doc/v3/api_samples/all_extensions/server-post-req.json
+++ b/doc/v3/api_samples/all_extensions/server-post-req.json
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavor_ref" : "http://openstack.example.com/openstack/flavors/1",
+        "image_ref" : "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+        "flavor_ref" : "http://openstack.example.com/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/all_extensions/server-post-req.xml b/doc/v3/api_samples/all_extensions/server-post-req.xml
index 598839cf6a..2a0b4ace7d 100644
--- a/doc/v3/api_samples/all_extensions/server-post-req.xml
+++ b/doc/v3/api_samples/all_extensions/server-post-req.xml
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
-</server>
\ No newline at end of file
+</server>
diff --git a/doc/v3/api_samples/consoles/server-post-req.json b/doc/v3/api_samples/consoles/server-post-req.json
index d41985a1bc..2eedab6147 100644
--- a/doc/v3/api_samples/consoles/server-post-req.json
+++ b/doc/v3/api_samples/consoles/server-post-req.json
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavor_ref" : "http://openstack.example.com/openstack/flavors/1",
+        "image_ref" : "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+        "flavor_ref" : "http://openstack.example.com/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/consoles/server-post-req.xml b/doc/v3/api_samples/consoles/server-post-req.xml
index 598839cf6a..2a0b4ace7d 100644
--- a/doc/v3/api_samples/consoles/server-post-req.xml
+++ b/doc/v3/api_samples/consoles/server-post-req.xml
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
-</server>
\ No newline at end of file
+</server>
diff --git a/doc/v3/api_samples/os-admin-actions/server-post-req.json b/doc/v3/api_samples/os-admin-actions/server-post-req.json
index 30851df41a..2eedab6147 100644
--- a/doc/v3/api_samples/os-admin-actions/server-post-req.json
+++ b/doc/v3/api_samples/os-admin-actions/server-post-req.json
@@ -5,12 +5,6 @@
         "flavor_ref" : "http://openstack.example.com/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-admin-actions/server-post-req.xml b/doc/v3/api_samples/os-admin-actions/server-post-req.xml
index 24eabe8533..2a0b4ace7d 100644
--- a/doc/v3/api_samples/os-admin-actions/server-post-req.xml
+++ b/doc/v3/api_samples/os-admin-actions/server-post-req.xml
@@ -3,17 +3,4 @@
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
-</server>
\ No newline at end of file
+</server>
diff --git a/doc/v3/api_samples/os-admin-password/server-post-req.json b/doc/v3/api_samples/os-admin-password/server-post-req.json
index d41985a1bc..2eedab6147 100644
--- a/doc/v3/api_samples/os-admin-password/server-post-req.json
+++ b/doc/v3/api_samples/os-admin-password/server-post-req.json
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavor_ref" : "http://openstack.example.com/openstack/flavors/1",
+        "image_ref" : "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+        "flavor_ref" : "http://openstack.example.com/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-admin-password/server-post-req.xml b/doc/v3/api_samples/os-admin-password/server-post-req.xml
index 598839cf6a..2a0b4ace7d 100644
--- a/doc/v3/api_samples/os-admin-password/server-post-req.xml
+++ b/doc/v3/api_samples/os-admin-password/server-post-req.xml
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
-</server>
\ No newline at end of file
+</server>
diff --git a/doc/v3/api_samples/os-attach-interfaces/server-post-req.json b/doc/v3/api_samples/os-attach-interfaces/server-post-req.json
index d41985a1bc..2eedab6147 100644
--- a/doc/v3/api_samples/os-attach-interfaces/server-post-req.json
+++ b/doc/v3/api_samples/os-attach-interfaces/server-post-req.json
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavor_ref" : "http://openstack.example.com/openstack/flavors/1",
+        "image_ref" : "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+        "flavor_ref" : "http://openstack.example.com/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-attach-interfaces/server-post-req.xml b/doc/v3/api_samples/os-attach-interfaces/server-post-req.xml
index 598839cf6a..2a0b4ace7d 100644
--- a/doc/v3/api_samples/os-attach-interfaces/server-post-req.xml
+++ b/doc/v3/api_samples/os-attach-interfaces/server-post-req.xml
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
-</server>
\ No newline at end of file
+</server>
diff --git a/doc/v3/api_samples/os-config-drive/server-post-req.json b/doc/v3/api_samples/os-config-drive/server-post-req.json
index d41985a1bc..2eedab6147 100644
--- a/doc/v3/api_samples/os-config-drive/server-post-req.json
+++ b/doc/v3/api_samples/os-config-drive/server-post-req.json
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavor_ref" : "http://openstack.example.com/openstack/flavors/1",
+        "image_ref" : "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+        "flavor_ref" : "http://openstack.example.com/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-config-drive/server-post-req.xml b/doc/v3/api_samples/os-config-drive/server-post-req.xml
index 598839cf6a..2a0b4ace7d 100644
--- a/doc/v3/api_samples/os-config-drive/server-post-req.xml
+++ b/doc/v3/api_samples/os-config-drive/server-post-req.xml
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
-</server>
\ No newline at end of file
+</server>
diff --git a/doc/v3/api_samples/os-console-output/server-post-req.json b/doc/v3/api_samples/os-console-output/server-post-req.json
index d41985a1bc..2eedab6147 100644
--- a/doc/v3/api_samples/os-console-output/server-post-req.json
+++ b/doc/v3/api_samples/os-console-output/server-post-req.json
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavor_ref" : "http://openstack.example.com/openstack/flavors/1",
+        "image_ref" : "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+        "flavor_ref" : "http://openstack.example.com/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-console-output/server-post-req.xml b/doc/v3/api_samples/os-console-output/server-post-req.xml
index 598839cf6a..2a0b4ace7d 100644
--- a/doc/v3/api_samples/os-console-output/server-post-req.xml
+++ b/doc/v3/api_samples/os-console-output/server-post-req.xml
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
-</server>
\ No newline at end of file
+</server>
diff --git a/doc/v3/api_samples/os-deferred-delete/server-post-req.json b/doc/v3/api_samples/os-deferred-delete/server-post-req.json
index d41985a1bc..2eedab6147 100644
--- a/doc/v3/api_samples/os-deferred-delete/server-post-req.json
+++ b/doc/v3/api_samples/os-deferred-delete/server-post-req.json
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavor_ref" : "http://openstack.example.com/openstack/flavors/1",
+        "image_ref" : "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+        "flavor_ref" : "http://openstack.example.com/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-deferred-delete/server-post-req.xml b/doc/v3/api_samples/os-deferred-delete/server-post-req.xml
index 598839cf6a..2a0b4ace7d 100644
--- a/doc/v3/api_samples/os-deferred-delete/server-post-req.xml
+++ b/doc/v3/api_samples/os-deferred-delete/server-post-req.xml
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
-</server>
\ No newline at end of file
+</server>
diff --git a/doc/v3/api_samples/os-disk-config/server-post-req.json b/doc/v3/api_samples/os-disk-config/server-post-req.json
index d41985a1bc..2eedab6147 100644
--- a/doc/v3/api_samples/os-disk-config/server-post-req.json
+++ b/doc/v3/api_samples/os-disk-config/server-post-req.json
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavor_ref" : "http://openstack.example.com/openstack/flavors/1",
+        "image_ref" : "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+        "flavor_ref" : "http://openstack.example.com/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-disk-config/server-post-req.xml b/doc/v3/api_samples/os-disk-config/server-post-req.xml
index 598839cf6a..2a0b4ace7d 100644
--- a/doc/v3/api_samples/os-disk-config/server-post-req.xml
+++ b/doc/v3/api_samples/os-disk-config/server-post-req.xml
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
-</server>
\ No newline at end of file
+</server>
diff --git a/doc/v3/api_samples/os-evacuate/server-post-req.json b/doc/v3/api_samples/os-evacuate/server-post-req.json
index 33a7156562..2eedab6147 100644
--- a/doc/v3/api_samples/os-evacuate/server-post-req.json
+++ b/doc/v3/api_samples/os-evacuate/server-post-req.json
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+        "image_ref" : "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
         "flavor_ref" : "http://openstack.example.com/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-evacuate/server-post-req.xml b/doc/v3/api_samples/os-evacuate/server-post-req.xml
index ac49b9cb61..2a0b4ace7d 100644
--- a/doc/v3/api_samples/os-evacuate/server-post-req.xml
+++ b/doc/v3/api_samples/os-evacuate/server-post-req.xml
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
-</server>
\ No newline at end of file
+</server>
diff --git a/doc/v3/api_samples/os-extended-availability-zone/server-post-req.json b/doc/v3/api_samples/os-extended-availability-zone/server-post-req.json
index 30851df41a..2eedab6147 100644
--- a/doc/v3/api_samples/os-extended-availability-zone/server-post-req.json
+++ b/doc/v3/api_samples/os-extended-availability-zone/server-post-req.json
@@ -5,12 +5,6 @@
         "flavor_ref" : "http://openstack.example.com/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-extended-availability-zone/server-post-req.xml b/doc/v3/api_samples/os-extended-availability-zone/server-post-req.xml
index 24eabe8533..2a0b4ace7d 100644
--- a/doc/v3/api_samples/os-extended-availability-zone/server-post-req.xml
+++ b/doc/v3/api_samples/os-extended-availability-zone/server-post-req.xml
@@ -3,17 +3,4 @@
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
-</server>
\ No newline at end of file
+</server>
diff --git a/doc/v3/api_samples/os-extended-server-attributes/server-post-req.json b/doc/v3/api_samples/os-extended-server-attributes/server-post-req.json
index 30851df41a..2eedab6147 100644
--- a/doc/v3/api_samples/os-extended-server-attributes/server-post-req.json
+++ b/doc/v3/api_samples/os-extended-server-attributes/server-post-req.json
@@ -5,12 +5,6 @@
         "flavor_ref" : "http://openstack.example.com/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-extended-server-attributes/server-post-req.xml b/doc/v3/api_samples/os-extended-server-attributes/server-post-req.xml
index 24eabe8533..2a0b4ace7d 100644
--- a/doc/v3/api_samples/os-extended-server-attributes/server-post-req.xml
+++ b/doc/v3/api_samples/os-extended-server-attributes/server-post-req.xml
@@ -3,17 +3,4 @@
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
-</server>
\ No newline at end of file
+</server>
diff --git a/doc/v3/api_samples/os-extended-status/server-post-req.json b/doc/v3/api_samples/os-extended-status/server-post-req.json
index 30851df41a..2eedab6147 100644
--- a/doc/v3/api_samples/os-extended-status/server-post-req.json
+++ b/doc/v3/api_samples/os-extended-status/server-post-req.json
@@ -5,12 +5,6 @@
         "flavor_ref" : "http://openstack.example.com/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-extended-status/server-post-req.xml b/doc/v3/api_samples/os-extended-status/server-post-req.xml
index 24eabe8533..2a0b4ace7d 100644
--- a/doc/v3/api_samples/os-extended-status/server-post-req.xml
+++ b/doc/v3/api_samples/os-extended-status/server-post-req.xml
@@ -3,17 +3,4 @@
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
-</server>
\ No newline at end of file
+</server>
diff --git a/doc/v3/api_samples/os-extended-volumes/server-post-req.json b/doc/v3/api_samples/os-extended-volumes/server-post-req.json
index 30851df41a..2eedab6147 100644
--- a/doc/v3/api_samples/os-extended-volumes/server-post-req.json
+++ b/doc/v3/api_samples/os-extended-volumes/server-post-req.json
@@ -5,12 +5,6 @@
         "flavor_ref" : "http://openstack.example.com/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-extended-volumes/server-post-req.xml b/doc/v3/api_samples/os-extended-volumes/server-post-req.xml
index 24eabe8533..2a0b4ace7d 100644
--- a/doc/v3/api_samples/os-extended-volumes/server-post-req.xml
+++ b/doc/v3/api_samples/os-extended-volumes/server-post-req.xml
@@ -3,17 +3,4 @@
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
-</server>
\ No newline at end of file
+</server>
diff --git a/doc/v3/api_samples/os-hide-server-addresses/server-post-req.json b/doc/v3/api_samples/os-hide-server-addresses/server-post-req.json
index d41985a1bc..2eedab6147 100644
--- a/doc/v3/api_samples/os-hide-server-addresses/server-post-req.json
+++ b/doc/v3/api_samples/os-hide-server-addresses/server-post-req.json
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavor_ref" : "http://openstack.example.com/openstack/flavors/1",
+        "image_ref" : "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+        "flavor_ref" : "http://openstack.example.com/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-hide-server-addresses/server-post-req.xml b/doc/v3/api_samples/os-hide-server-addresses/server-post-req.xml
index 598839cf6a..2a0b4ace7d 100644
--- a/doc/v3/api_samples/os-hide-server-addresses/server-post-req.xml
+++ b/doc/v3/api_samples/os-hide-server-addresses/server-post-req.xml
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
-</server>
\ No newline at end of file
+</server>
diff --git a/doc/v3/api_samples/os-multinic/server-post-req.json b/doc/v3/api_samples/os-multinic/server-post-req.json
index d41985a1bc..2eedab6147 100644
--- a/doc/v3/api_samples/os-multinic/server-post-req.json
+++ b/doc/v3/api_samples/os-multinic/server-post-req.json
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavor_ref" : "http://openstack.example.com/openstack/flavors/1",
+        "image_ref" : "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+        "flavor_ref" : "http://openstack.example.com/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-multinic/server-post-req.xml b/doc/v3/api_samples/os-multinic/server-post-req.xml
index 598839cf6a..2a0b4ace7d 100644
--- a/doc/v3/api_samples/os-multinic/server-post-req.xml
+++ b/doc/v3/api_samples/os-multinic/server-post-req.xml
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
-</server>
\ No newline at end of file
+</server>
diff --git a/doc/v3/api_samples/os-remote-consoles/server-post-req.json b/doc/v3/api_samples/os-remote-consoles/server-post-req.json
index d41985a1bc..2eedab6147 100644
--- a/doc/v3/api_samples/os-remote-consoles/server-post-req.json
+++ b/doc/v3/api_samples/os-remote-consoles/server-post-req.json
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavor_ref" : "http://openstack.example.com/openstack/flavors/1",
+        "image_ref" : "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+        "flavor_ref" : "http://openstack.example.com/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-remote-consoles/server-post-req.xml b/doc/v3/api_samples/os-remote-consoles/server-post-req.xml
index 598839cf6a..2a0b4ace7d 100644
--- a/doc/v3/api_samples/os-remote-consoles/server-post-req.xml
+++ b/doc/v3/api_samples/os-remote-consoles/server-post-req.xml
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
-</server>
\ No newline at end of file
+</server>
diff --git a/doc/v3/api_samples/os-rescue/server-post-req.json b/doc/v3/api_samples/os-rescue/server-post-req.json
index d41985a1bc..2eedab6147 100644
--- a/doc/v3/api_samples/os-rescue/server-post-req.json
+++ b/doc/v3/api_samples/os-rescue/server-post-req.json
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavor_ref" : "http://openstack.example.com/openstack/flavors/1",
+        "image_ref" : "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+        "flavor_ref" : "http://openstack.example.com/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-rescue/server-post-req.xml b/doc/v3/api_samples/os-rescue/server-post-req.xml
index 598839cf6a..2a0b4ace7d 100644
--- a/doc/v3/api_samples/os-rescue/server-post-req.xml
+++ b/doc/v3/api_samples/os-rescue/server-post-req.xml
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
-</server>
\ No newline at end of file
+</server>
diff --git a/doc/v3/api_samples/os-security-groups/server-post-req.json b/doc/v3/api_samples/os-security-groups/server-post-req.json
index cd323c6ffe..428217cfc3 100644
--- a/doc/v3/api_samples/os-security-groups/server-post-req.json
+++ b/doc/v3/api_samples/os-security-groups/server-post-req.json
@@ -6,12 +6,6 @@
         "metadata" : {
             "My Server Name" : "Apache1"
         },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ],
         "os-security-groups:security_groups": [{"name": "test"}]
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-security-groups/server-post-req.xml b/doc/v3/api_samples/os-security-groups/server-post-req.xml
index 6494a574f4..d749f13fad 100644
--- a/doc/v3/api_samples/os-security-groups/server-post-req.xml
+++ b/doc/v3/api_samples/os-security-groups/server-post-req.xml
@@ -3,20 +3,7 @@
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
   <os-security-groups:security_groups>
     <security_group name="test" />
   </os-security-groups:security_groups>
-</server>
\ No newline at end of file
+</server>
diff --git a/doc/v3/api_samples/os-server-diagnostics/server-post-req.json b/doc/v3/api_samples/os-server-diagnostics/server-post-req.json
index d41985a1bc..2eedab6147 100644
--- a/doc/v3/api_samples/os-server-diagnostics/server-post-req.json
+++ b/doc/v3/api_samples/os-server-diagnostics/server-post-req.json
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavor_ref" : "http://openstack.example.com/openstack/flavors/1",
+        "image_ref" : "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+        "flavor_ref" : "http://openstack.example.com/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-server-diagnostics/server-post-req.xml b/doc/v3/api_samples/os-server-diagnostics/server-post-req.xml
index 598839cf6a..2a0b4ace7d 100644
--- a/doc/v3/api_samples/os-server-diagnostics/server-post-req.xml
+++ b/doc/v3/api_samples/os-server-diagnostics/server-post-req.xml
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
-</server>
\ No newline at end of file
+</server>
diff --git a/doc/v3/api_samples/os-server-usage/server-post-req.json b/doc/v3/api_samples/os-server-usage/server-post-req.json
index dbab73df0a..2eedab6147 100644
--- a/doc/v3/api_samples/os-server-usage/server-post-req.json
+++ b/doc/v3/api_samples/os-server-usage/server-post-req.json
@@ -2,15 +2,9 @@
     "server" : {
         "name" : "new-server-test",
         "image_ref" : "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavor_ref" : "http://openstack.example.com/openstack/flavors/1",
+        "flavor_ref" : "http://openstack.example.com/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-server-usage/server-post-req.xml b/doc/v3/api_samples/os-server-usage/server-post-req.xml
index 57cc14ea0c..2a0b4ace7d 100644
--- a/doc/v3/api_samples/os-server-usage/server-post-req.xml
+++ b/doc/v3/api_samples/os-server-usage/server-post-req.xml
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
-</server>
\ No newline at end of file
+</server>
diff --git a/doc/v3/api_samples/os-simple-tenant-usage/server-post-req.json b/doc/v3/api_samples/os-simple-tenant-usage/server-post-req.json
index d41985a1bc..2eedab6147 100644
--- a/doc/v3/api_samples/os-simple-tenant-usage/server-post-req.json
+++ b/doc/v3/api_samples/os-simple-tenant-usage/server-post-req.json
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavor_ref" : "http://openstack.example.com/openstack/flavors/1",
+        "image_ref" : "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+        "flavor_ref" : "http://openstack.example.com/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-simple-tenant-usage/server-post-req.xml b/doc/v3/api_samples/os-simple-tenant-usage/server-post-req.xml
index 598839cf6a..2a0b4ace7d 100644
--- a/doc/v3/api_samples/os-simple-tenant-usage/server-post-req.xml
+++ b/doc/v3/api_samples/os-simple-tenant-usage/server-post-req.xml
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
-</server>
\ No newline at end of file
+</server>
diff --git a/doc/v3/api_samples/os-user-data/userdata-post-req.json b/doc/v3/api_samples/os-user-data/userdata-post-req.json
index 875862be48..21ca21b6db 100644
--- a/doc/v3/api_samples/os-user-data/userdata-post-req.json
+++ b/doc/v3/api_samples/os-user-data/userdata-post-req.json
@@ -6,12 +6,6 @@
         "metadata" : {
             "My Server Name" : "Apache1"
         },
-        "user_data" : "IyEvYmluL2Jhc2gKL2Jpbi9zdQplY2hvICJJIGFtIGluIHlvdSEiCg==",
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        "user_data" : "IyEvYmluL2Jhc2gKL2Jpbi9zdQplY2hvICJJIGFtIGluIHlvdSEiCg=="
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-user-data/userdata-post-req.xml b/doc/v3/api_samples/os-user-data/userdata-post-req.xml
index 95a6b41b1d..42906c4822 100644
--- a/doc/v3/api_samples/os-user-data/userdata-post-req.xml
+++ b/doc/v3/api_samples/os-user-data/userdata-post-req.xml
@@ -9,17 +9,4 @@
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
-</server>
\ No newline at end of file
+</server>
diff --git a/doc/v3/api_samples/server-ips/server-post-req.json b/doc/v3/api_samples/server-ips/server-post-req.json
index d41985a1bc..2eedab6147 100644
--- a/doc/v3/api_samples/server-ips/server-post-req.json
+++ b/doc/v3/api_samples/server-ips/server-post-req.json
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavor_ref" : "http://openstack.example.com/openstack/flavors/1",
+        "image_ref" : "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+        "flavor_ref" : "http://openstack.example.com/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/server-ips/server-post-req.xml b/doc/v3/api_samples/server-ips/server-post-req.xml
index 598839cf6a..2a0b4ace7d 100644
--- a/doc/v3/api_samples/server-ips/server-post-req.xml
+++ b/doc/v3/api_samples/server-ips/server-post-req.xml
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
-</server>
\ No newline at end of file
+</server>
diff --git a/doc/v3/api_samples/server-metadata/server-post-req.json b/doc/v3/api_samples/server-metadata/server-post-req.json
index d41985a1bc..2eedab6147 100644
--- a/doc/v3/api_samples/server-metadata/server-post-req.json
+++ b/doc/v3/api_samples/server-metadata/server-post-req.json
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavor_ref" : "http://openstack.example.com/openstack/flavors/1",
+        "image_ref" : "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+        "flavor_ref" : "http://openstack.example.com/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/server-metadata/server-post-req.xml b/doc/v3/api_samples/server-metadata/server-post-req.xml
index 598839cf6a..2a0b4ace7d 100644
--- a/doc/v3/api_samples/server-metadata/server-post-req.xml
+++ b/doc/v3/api_samples/server-metadata/server-post-req.xml
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
-</server>
\ No newline at end of file
+</server>
diff --git a/doc/v3/api_samples/servers/server-post-req.json b/doc/v3/api_samples/servers/server-post-req.json
index d41985a1bc..2eedab6147 100644
--- a/doc/v3/api_samples/servers/server-post-req.json
+++ b/doc/v3/api_samples/servers/server-post-req.json
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavor_ref" : "http://openstack.example.com/openstack/flavors/1",
+        "image_ref" : "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+        "flavor_ref" : "http://openstack.example.com/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/servers/server-post-req.xml b/doc/v3/api_samples/servers/server-post-req.xml
index 598839cf6a..2a0b4ace7d 100644
--- a/doc/v3/api_samples/servers/server-post-req.xml
+++ b/doc/v3/api_samples/servers/server-post-req.xml
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
-</server>
\ No newline at end of file
+</server>
diff --git a/nova/tests/integrated/v3/api_samples/all_extensions/server-post-req.json.tpl b/nova/tests/integrated/v3/api_samples/all_extensions/server-post-req.json.tpl
index 1dcb63e3b2..d9a7537dfb 100644
--- a/nova/tests/integrated/v3/api_samples/all_extensions/server-post-req.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/all_extensions/server-post-req.json.tpl
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "%(host)s/openstack/images/%(image_id)s",
-        "flavor_ref" : "%(host)s/openstack/flavors/1",
+        "image_ref" : "%(glance_host)s/images/%(image_id)s",
+        "flavor_ref" : "%(host)s/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
 }
diff --git a/nova/tests/integrated/v3/api_samples/all_extensions/server-post-req.xml.tpl b/nova/tests/integrated/v3/api_samples/all_extensions/server-post-req.xml.tpl
index ddb5ea78c4..eb788b2a7a 100644
--- a/nova/tests/integrated/v3/api_samples/all_extensions/server-post-req.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/all_extensions/server-post-req.xml.tpl
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(host)s/openstack/images/%(image_id)s" flavor_ref="%(host)s/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(glance_host)s/images/%(image_id)s" flavor_ref="%(host)s/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
 </server>
diff --git a/nova/tests/integrated/v3/api_samples/consoles/server-post-req.json.tpl b/nova/tests/integrated/v3/api_samples/consoles/server-post-req.json.tpl
index 1dcb63e3b2..d9a7537dfb 100644
--- a/nova/tests/integrated/v3/api_samples/consoles/server-post-req.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/consoles/server-post-req.json.tpl
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "%(host)s/openstack/images/%(image_id)s",
-        "flavor_ref" : "%(host)s/openstack/flavors/1",
+        "image_ref" : "%(glance_host)s/images/%(image_id)s",
+        "flavor_ref" : "%(host)s/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
 }
diff --git a/nova/tests/integrated/v3/api_samples/consoles/server-post-req.xml.tpl b/nova/tests/integrated/v3/api_samples/consoles/server-post-req.xml.tpl
index ddb5ea78c4..eb788b2a7a 100644
--- a/nova/tests/integrated/v3/api_samples/consoles/server-post-req.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/consoles/server-post-req.xml.tpl
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(host)s/openstack/images/%(image_id)s" flavor_ref="%(host)s/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(glance_host)s/images/%(image_id)s" flavor_ref="%(host)s/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
 </server>
diff --git a/nova/tests/integrated/v3/api_samples/os-admin-actions/server-post-req.json.tpl b/nova/tests/integrated/v3/api_samples/os-admin-actions/server-post-req.json.tpl
index e6c046ceb4..d9a7537dfb 100644
--- a/nova/tests/integrated/v3/api_samples/os-admin-actions/server-post-req.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-admin-actions/server-post-req.json.tpl
@@ -5,12 +5,6 @@
         "flavor_ref" : "%(host)s/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
 }
diff --git a/nova/tests/integrated/v3/api_samples/os-admin-actions/server-post-req.xml.tpl b/nova/tests/integrated/v3/api_samples/os-admin-actions/server-post-req.xml.tpl
index 31892a3c1f..eb788b2a7a 100644
--- a/nova/tests/integrated/v3/api_samples/os-admin-actions/server-post-req.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-admin-actions/server-post-req.xml.tpl
@@ -3,17 +3,4 @@
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
 </server>
diff --git a/nova/tests/integrated/v3/api_samples/os-admin-password/server-post-req.json.tpl b/nova/tests/integrated/v3/api_samples/os-admin-password/server-post-req.json.tpl
index 1dcb63e3b2..d9a7537dfb 100644
--- a/nova/tests/integrated/v3/api_samples/os-admin-password/server-post-req.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-admin-password/server-post-req.json.tpl
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "%(host)s/openstack/images/%(image_id)s",
-        "flavor_ref" : "%(host)s/openstack/flavors/1",
+        "image_ref" : "%(glance_host)s/images/%(image_id)s",
+        "flavor_ref" : "%(host)s/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
 }
diff --git a/nova/tests/integrated/v3/api_samples/os-admin-password/server-post-req.xml.tpl b/nova/tests/integrated/v3/api_samples/os-admin-password/server-post-req.xml.tpl
index ddb5ea78c4..eb788b2a7a 100644
--- a/nova/tests/integrated/v3/api_samples/os-admin-password/server-post-req.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-admin-password/server-post-req.xml.tpl
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(host)s/openstack/images/%(image_id)s" flavor_ref="%(host)s/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(glance_host)s/images/%(image_id)s" flavor_ref="%(host)s/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
 </server>
diff --git a/nova/tests/integrated/v3/api_samples/os-attach-interfaces/server-post-req.json.tpl b/nova/tests/integrated/v3/api_samples/os-attach-interfaces/server-post-req.json.tpl
index 1dcb63e3b2..d9a7537dfb 100644
--- a/nova/tests/integrated/v3/api_samples/os-attach-interfaces/server-post-req.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-attach-interfaces/server-post-req.json.tpl
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "%(host)s/openstack/images/%(image_id)s",
-        "flavor_ref" : "%(host)s/openstack/flavors/1",
+        "image_ref" : "%(glance_host)s/images/%(image_id)s",
+        "flavor_ref" : "%(host)s/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
 }
diff --git a/nova/tests/integrated/v3/api_samples/os-attach-interfaces/server-post-req.xml.tpl b/nova/tests/integrated/v3/api_samples/os-attach-interfaces/server-post-req.xml.tpl
index ddb5ea78c4..eb788b2a7a 100644
--- a/nova/tests/integrated/v3/api_samples/os-attach-interfaces/server-post-req.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-attach-interfaces/server-post-req.xml.tpl
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(host)s/openstack/images/%(image_id)s" flavor_ref="%(host)s/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(glance_host)s/images/%(image_id)s" flavor_ref="%(host)s/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
 </server>
diff --git a/nova/tests/integrated/v3/api_samples/os-config-drive/server-post-req.json.tpl b/nova/tests/integrated/v3/api_samples/os-config-drive/server-post-req.json.tpl
index 1dcb63e3b2..d9a7537dfb 100644
--- a/nova/tests/integrated/v3/api_samples/os-config-drive/server-post-req.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-config-drive/server-post-req.json.tpl
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "%(host)s/openstack/images/%(image_id)s",
-        "flavor_ref" : "%(host)s/openstack/flavors/1",
+        "image_ref" : "%(glance_host)s/images/%(image_id)s",
+        "flavor_ref" : "%(host)s/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
 }
diff --git a/nova/tests/integrated/v3/api_samples/os-config-drive/server-post-req.xml.tpl b/nova/tests/integrated/v3/api_samples/os-config-drive/server-post-req.xml.tpl
index ddb5ea78c4..eb788b2a7a 100644
--- a/nova/tests/integrated/v3/api_samples/os-config-drive/server-post-req.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-config-drive/server-post-req.xml.tpl
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(host)s/openstack/images/%(image_id)s" flavor_ref="%(host)s/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(glance_host)s/images/%(image_id)s" flavor_ref="%(host)s/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
 </server>
diff --git a/nova/tests/integrated/v3/api_samples/os-console-output/server-post-req.json.tpl b/nova/tests/integrated/v3/api_samples/os-console-output/server-post-req.json.tpl
index 1dcb63e3b2..d9a7537dfb 100644
--- a/nova/tests/integrated/v3/api_samples/os-console-output/server-post-req.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-console-output/server-post-req.json.tpl
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "%(host)s/openstack/images/%(image_id)s",
-        "flavor_ref" : "%(host)s/openstack/flavors/1",
+        "image_ref" : "%(glance_host)s/images/%(image_id)s",
+        "flavor_ref" : "%(host)s/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
 }
diff --git a/nova/tests/integrated/v3/api_samples/os-console-output/server-post-req.xml.tpl b/nova/tests/integrated/v3/api_samples/os-console-output/server-post-req.xml.tpl
index ddb5ea78c4..eb788b2a7a 100644
--- a/nova/tests/integrated/v3/api_samples/os-console-output/server-post-req.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-console-output/server-post-req.xml.tpl
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(host)s/openstack/images/%(image_id)s" flavor_ref="%(host)s/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(glance_host)s/images/%(image_id)s" flavor_ref="%(host)s/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
 </server>
diff --git a/nova/tests/integrated/v3/api_samples/os-deferred-delete/server-post-req.json.tpl b/nova/tests/integrated/v3/api_samples/os-deferred-delete/server-post-req.json.tpl
index 1dcb63e3b2..d9a7537dfb 100644
--- a/nova/tests/integrated/v3/api_samples/os-deferred-delete/server-post-req.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-deferred-delete/server-post-req.json.tpl
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "%(host)s/openstack/images/%(image_id)s",
-        "flavor_ref" : "%(host)s/openstack/flavors/1",
+        "image_ref" : "%(glance_host)s/images/%(image_id)s",
+        "flavor_ref" : "%(host)s/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
 }
diff --git a/nova/tests/integrated/v3/api_samples/os-deferred-delete/server-post-req.xml.tpl b/nova/tests/integrated/v3/api_samples/os-deferred-delete/server-post-req.xml.tpl
index ddb5ea78c4..eb788b2a7a 100644
--- a/nova/tests/integrated/v3/api_samples/os-deferred-delete/server-post-req.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-deferred-delete/server-post-req.xml.tpl
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(host)s/openstack/images/%(image_id)s" flavor_ref="%(host)s/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(glance_host)s/images/%(image_id)s" flavor_ref="%(host)s/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
 </server>
diff --git a/nova/tests/integrated/v3/api_samples/os-disk-config/server-post-req.json.tpl b/nova/tests/integrated/v3/api_samples/os-disk-config/server-post-req.json.tpl
index 1dcb63e3b2..d9a7537dfb 100644
--- a/nova/tests/integrated/v3/api_samples/os-disk-config/server-post-req.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-disk-config/server-post-req.json.tpl
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "%(host)s/openstack/images/%(image_id)s",
-        "flavor_ref" : "%(host)s/openstack/flavors/1",
+        "image_ref" : "%(glance_host)s/images/%(image_id)s",
+        "flavor_ref" : "%(host)s/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
 }
diff --git a/nova/tests/integrated/v3/api_samples/os-disk-config/server-post-req.xml.tpl b/nova/tests/integrated/v3/api_samples/os-disk-config/server-post-req.xml.tpl
index 866daf0b47..ec022d7d31 100644
--- a/nova/tests/integrated/v3/api_samples/os-disk-config/server-post-req.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-disk-config/server-post-req.xml.tpl
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" xmlns:os-disk-config="http://docs.openstack.org/compute/ext/disk_config/api/v1.1" image_ref="%(host)s/openstack/images/%(image_id)s" flavor_ref="%(host)s/openstack/flavors/1" name="new-server-test" os-disk-config:disk_config="AUTO">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" xmlns:os-disk-config="http://docs.openstack.org/compute/ext/disk_config/api/v1.1" image_ref="%(glance_host)s/images/%(image_id)s" flavor_ref="%(host)s/flavors/1" name="new-server-test" os-disk-config:disk_config="AUTO">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
 </server>
diff --git a/nova/tests/integrated/v3/api_samples/os-evacuate/server-post-req.json.tpl b/nova/tests/integrated/v3/api_samples/os-evacuate/server-post-req.json.tpl
index 2a8c020df3..d9a7537dfb 100644
--- a/nova/tests/integrated/v3/api_samples/os-evacuate/server-post-req.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-evacuate/server-post-req.json.tpl
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "%(host)s/images/%(image_id)s",
+        "image_ref" : "%(glance_host)s/images/%(image_id)s",
         "flavor_ref" : "%(host)s/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
 }
diff --git a/nova/tests/integrated/v3/api_samples/os-evacuate/server-post-req.xml.tpl b/nova/tests/integrated/v3/api_samples/os-evacuate/server-post-req.xml.tpl
index 14f6bfdc89..eb788b2a7a 100644
--- a/nova/tests/integrated/v3/api_samples/os-evacuate/server-post-req.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-evacuate/server-post-req.xml.tpl
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(host)s/images/%(image_id)s" flavor_ref="%(host)s/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(glance_host)s/images/%(image_id)s" flavor_ref="%(host)s/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
 </server>
diff --git a/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/server-post-req.json.tpl b/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/server-post-req.json.tpl
index e6c046ceb4..d9a7537dfb 100644
--- a/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/server-post-req.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/server-post-req.json.tpl
@@ -5,12 +5,6 @@
         "flavor_ref" : "%(host)s/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
 }
diff --git a/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/server-post-req.xml.tpl b/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/server-post-req.xml.tpl
index 31892a3c1f..eb788b2a7a 100644
--- a/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/server-post-req.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/server-post-req.xml.tpl
@@ -3,17 +3,4 @@
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
 </server>
diff --git a/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/server-post-req.json.tpl b/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/server-post-req.json.tpl
index e6c046ceb4..d9a7537dfb 100644
--- a/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/server-post-req.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/server-post-req.json.tpl
@@ -5,12 +5,6 @@
         "flavor_ref" : "%(host)s/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
 }
diff --git a/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/server-post-req.xml.tpl b/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/server-post-req.xml.tpl
index 31892a3c1f..eb788b2a7a 100644
--- a/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/server-post-req.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/server-post-req.xml.tpl
@@ -3,17 +3,4 @@
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
 </server>
diff --git a/nova/tests/integrated/v3/api_samples/os-extended-status/server-post-req.json.tpl b/nova/tests/integrated/v3/api_samples/os-extended-status/server-post-req.json.tpl
index e6c046ceb4..d9a7537dfb 100644
--- a/nova/tests/integrated/v3/api_samples/os-extended-status/server-post-req.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-extended-status/server-post-req.json.tpl
@@ -5,12 +5,6 @@
         "flavor_ref" : "%(host)s/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
 }
diff --git a/nova/tests/integrated/v3/api_samples/os-extended-status/server-post-req.xml.tpl b/nova/tests/integrated/v3/api_samples/os-extended-status/server-post-req.xml.tpl
index 31892a3c1f..eb788b2a7a 100644
--- a/nova/tests/integrated/v3/api_samples/os-extended-status/server-post-req.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-extended-status/server-post-req.xml.tpl
@@ -3,17 +3,4 @@
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
 </server>
diff --git a/nova/tests/integrated/v3/api_samples/os-extended-volumes/server-post-req.json.tpl b/nova/tests/integrated/v3/api_samples/os-extended-volumes/server-post-req.json.tpl
index e6c046ceb4..d9a7537dfb 100644
--- a/nova/tests/integrated/v3/api_samples/os-extended-volumes/server-post-req.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-extended-volumes/server-post-req.json.tpl
@@ -5,12 +5,6 @@
         "flavor_ref" : "%(host)s/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
 }
diff --git a/nova/tests/integrated/v3/api_samples/os-extended-volumes/server-post-req.xml.tpl b/nova/tests/integrated/v3/api_samples/os-extended-volumes/server-post-req.xml.tpl
index 31892a3c1f..eb788b2a7a 100644
--- a/nova/tests/integrated/v3/api_samples/os-extended-volumes/server-post-req.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-extended-volumes/server-post-req.xml.tpl
@@ -3,17 +3,4 @@
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
 </server>
diff --git a/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/server-post-req.json.tpl b/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/server-post-req.json.tpl
index 1dcb63e3b2..d9a7537dfb 100644
--- a/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/server-post-req.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/server-post-req.json.tpl
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "%(host)s/openstack/images/%(image_id)s",
-        "flavor_ref" : "%(host)s/openstack/flavors/1",
+        "image_ref" : "%(glance_host)s/images/%(image_id)s",
+        "flavor_ref" : "%(host)s/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
 }
diff --git a/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/server-post-req.xml.tpl b/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/server-post-req.xml.tpl
index ddb5ea78c4..eb788b2a7a 100644
--- a/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/server-post-req.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/server-post-req.xml.tpl
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(host)s/openstack/images/%(image_id)s" flavor_ref="%(host)s/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(glance_host)s/images/%(image_id)s" flavor_ref="%(host)s/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
 </server>
diff --git a/nova/tests/integrated/v3/api_samples/os-multinic/server-post-req.json.tpl b/nova/tests/integrated/v3/api_samples/os-multinic/server-post-req.json.tpl
index 1dcb63e3b2..d9a7537dfb 100644
--- a/nova/tests/integrated/v3/api_samples/os-multinic/server-post-req.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-multinic/server-post-req.json.tpl
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "%(host)s/openstack/images/%(image_id)s",
-        "flavor_ref" : "%(host)s/openstack/flavors/1",
+        "image_ref" : "%(glance_host)s/images/%(image_id)s",
+        "flavor_ref" : "%(host)s/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
 }
diff --git a/nova/tests/integrated/v3/api_samples/os-multinic/server-post-req.xml.tpl b/nova/tests/integrated/v3/api_samples/os-multinic/server-post-req.xml.tpl
index ddb5ea78c4..eb788b2a7a 100644
--- a/nova/tests/integrated/v3/api_samples/os-multinic/server-post-req.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-multinic/server-post-req.xml.tpl
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(host)s/openstack/images/%(image_id)s" flavor_ref="%(host)s/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(glance_host)s/images/%(image_id)s" flavor_ref="%(host)s/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
 </server>
diff --git a/nova/tests/integrated/v3/api_samples/os-remote-consoles/server-post-req.json.tpl b/nova/tests/integrated/v3/api_samples/os-remote-consoles/server-post-req.json.tpl
index 1dcb63e3b2..d9a7537dfb 100644
--- a/nova/tests/integrated/v3/api_samples/os-remote-consoles/server-post-req.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-remote-consoles/server-post-req.json.tpl
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "%(host)s/openstack/images/%(image_id)s",
-        "flavor_ref" : "%(host)s/openstack/flavors/1",
+        "image_ref" : "%(glance_host)s/images/%(image_id)s",
+        "flavor_ref" : "%(host)s/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
 }
diff --git a/nova/tests/integrated/v3/api_samples/os-remote-consoles/server-post-req.xml.tpl b/nova/tests/integrated/v3/api_samples/os-remote-consoles/server-post-req.xml.tpl
index ddb5ea78c4..eb788b2a7a 100644
--- a/nova/tests/integrated/v3/api_samples/os-remote-consoles/server-post-req.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-remote-consoles/server-post-req.xml.tpl
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(host)s/openstack/images/%(image_id)s" flavor_ref="%(host)s/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(glance_host)s/images/%(image_id)s" flavor_ref="%(host)s/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
 </server>
diff --git a/nova/tests/integrated/v3/api_samples/os-rescue/server-post-req.json.tpl b/nova/tests/integrated/v3/api_samples/os-rescue/server-post-req.json.tpl
index 1dcb63e3b2..d9a7537dfb 100644
--- a/nova/tests/integrated/v3/api_samples/os-rescue/server-post-req.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-rescue/server-post-req.json.tpl
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "%(host)s/openstack/images/%(image_id)s",
-        "flavor_ref" : "%(host)s/openstack/flavors/1",
+        "image_ref" : "%(glance_host)s/images/%(image_id)s",
+        "flavor_ref" : "%(host)s/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
 }
diff --git a/nova/tests/integrated/v3/api_samples/os-rescue/server-post-req.xml.tpl b/nova/tests/integrated/v3/api_samples/os-rescue/server-post-req.xml.tpl
index ddb5ea78c4..eb788b2a7a 100644
--- a/nova/tests/integrated/v3/api_samples/os-rescue/server-post-req.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-rescue/server-post-req.xml.tpl
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(host)s/openstack/images/%(image_id)s" flavor_ref="%(host)s/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(glance_host)s/images/%(image_id)s" flavor_ref="%(host)s/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
 </server>
diff --git a/nova/tests/integrated/v3/api_samples/os-security-groups/server-post-req.json.tpl b/nova/tests/integrated/v3/api_samples/os-security-groups/server-post-req.json.tpl
index 93af21d8ea..5a2262df91 100644
--- a/nova/tests/integrated/v3/api_samples/os-security-groups/server-post-req.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-security-groups/server-post-req.json.tpl
@@ -6,12 +6,6 @@
         "metadata" : {
             "My Server Name" : "Apache1"
         },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ],
         "os-security-groups:security_groups": [{"name": "test"}]
     }
 }
diff --git a/nova/tests/integrated/v3/api_samples/os-security-groups/server-post-req.xml.tpl b/nova/tests/integrated/v3/api_samples/os-security-groups/server-post-req.xml.tpl
index fe4169ed45..bc65635646 100644
--- a/nova/tests/integrated/v3/api_samples/os-security-groups/server-post-req.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-security-groups/server-post-req.xml.tpl
@@ -3,19 +3,6 @@
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
   <os-security-groups:security_groups>
     <security_group name="test" />
   </os-security-groups:security_groups>
diff --git a/nova/tests/integrated/v3/api_samples/os-server-diagnostics/server-post-req.json.tpl b/nova/tests/integrated/v3/api_samples/os-server-diagnostics/server-post-req.json.tpl
index 1dcb63e3b2..d9a7537dfb 100644
--- a/nova/tests/integrated/v3/api_samples/os-server-diagnostics/server-post-req.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-server-diagnostics/server-post-req.json.tpl
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "%(host)s/openstack/images/%(image_id)s",
-        "flavor_ref" : "%(host)s/openstack/flavors/1",
+        "image_ref" : "%(glance_host)s/images/%(image_id)s",
+        "flavor_ref" : "%(host)s/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
 }
diff --git a/nova/tests/integrated/v3/api_samples/os-server-diagnostics/server-post-req.xml.tpl b/nova/tests/integrated/v3/api_samples/os-server-diagnostics/server-post-req.xml.tpl
index ddb5ea78c4..eb788b2a7a 100644
--- a/nova/tests/integrated/v3/api_samples/os-server-diagnostics/server-post-req.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-server-diagnostics/server-post-req.xml.tpl
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(host)s/openstack/images/%(image_id)s" flavor_ref="%(host)s/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(glance_host)s/images/%(image_id)s" flavor_ref="%(host)s/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
 </server>
diff --git a/nova/tests/integrated/v3/api_samples/os-server-usage/server-post-req.json.tpl b/nova/tests/integrated/v3/api_samples/os-server-usage/server-post-req.json.tpl
index ed22b7861e..d9a7537dfb 100644
--- a/nova/tests/integrated/v3/api_samples/os-server-usage/server-post-req.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-server-usage/server-post-req.json.tpl
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "%(host)s/images/%(image_id)s",
-        "flavor_ref" : "%(host)s/openstack/flavors/1",
+        "image_ref" : "%(glance_host)s/images/%(image_id)s",
+        "flavor_ref" : "%(host)s/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
 }
diff --git a/nova/tests/integrated/v3/api_samples/os-server-usage/server-post-req.xml.tpl b/nova/tests/integrated/v3/api_samples/os-server-usage/server-post-req.xml.tpl
index e3f3dd0e5d..eb788b2a7a 100644
--- a/nova/tests/integrated/v3/api_samples/os-server-usage/server-post-req.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-server-usage/server-post-req.xml.tpl
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(host)s/images/%(image_id)s" flavor_ref="%(host)s/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(glance_host)s/images/%(image_id)s" flavor_ref="%(host)s/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
 </server>
diff --git a/nova/tests/integrated/v3/api_samples/os-simple-tenant-usage/server-post-req.json.tpl b/nova/tests/integrated/v3/api_samples/os-simple-tenant-usage/server-post-req.json.tpl
index 1dcb63e3b2..d9a7537dfb 100644
--- a/nova/tests/integrated/v3/api_samples/os-simple-tenant-usage/server-post-req.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-simple-tenant-usage/server-post-req.json.tpl
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "%(host)s/openstack/images/%(image_id)s",
-        "flavor_ref" : "%(host)s/openstack/flavors/1",
+        "image_ref" : "%(glance_host)s/images/%(image_id)s",
+        "flavor_ref" : "%(host)s/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
 }
diff --git a/nova/tests/integrated/v3/api_samples/os-simple-tenant-usage/server-post-req.xml.tpl b/nova/tests/integrated/v3/api_samples/os-simple-tenant-usage/server-post-req.xml.tpl
index ddb5ea78c4..eb788b2a7a 100644
--- a/nova/tests/integrated/v3/api_samples/os-simple-tenant-usage/server-post-req.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-simple-tenant-usage/server-post-req.xml.tpl
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(host)s/openstack/images/%(image_id)s" flavor_ref="%(host)s/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(glance_host)s/images/%(image_id)s" flavor_ref="%(host)s/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
 </server>
diff --git a/nova/tests/integrated/v3/api_samples/os-user-data/userdata-post-req.json.tpl b/nova/tests/integrated/v3/api_samples/os-user-data/userdata-post-req.json.tpl
index a8edee9002..9e6d436840 100644
--- a/nova/tests/integrated/v3/api_samples/os-user-data/userdata-post-req.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-user-data/userdata-post-req.json.tpl
@@ -6,12 +6,6 @@
         "metadata" : {
             "My Server Name" : "Apache1"
         },
-        "user_data" : "%(user_data)s",
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        "user_data" : "%(user_data)s"
     }
 }
diff --git a/nova/tests/integrated/v3/api_samples/os-user-data/userdata-post-req.xml.tpl b/nova/tests/integrated/v3/api_samples/os-user-data/userdata-post-req.xml.tpl
index acb2635a84..3e279ad1f7 100644
--- a/nova/tests/integrated/v3/api_samples/os-user-data/userdata-post-req.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-user-data/userdata-post-req.xml.tpl
@@ -9,17 +9,4 @@
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
 </server>
diff --git a/nova/tests/integrated/v3/api_samples/server-ips/server-post-req.json.tpl b/nova/tests/integrated/v3/api_samples/server-ips/server-post-req.json.tpl
index 1dcb63e3b2..d9a7537dfb 100644
--- a/nova/tests/integrated/v3/api_samples/server-ips/server-post-req.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/server-ips/server-post-req.json.tpl
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "%(host)s/openstack/images/%(image_id)s",
-        "flavor_ref" : "%(host)s/openstack/flavors/1",
+        "image_ref" : "%(glance_host)s/images/%(image_id)s",
+        "flavor_ref" : "%(host)s/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
 }
diff --git a/nova/tests/integrated/v3/api_samples/server-ips/server-post-req.xml.tpl b/nova/tests/integrated/v3/api_samples/server-ips/server-post-req.xml.tpl
index ddb5ea78c4..eb788b2a7a 100644
--- a/nova/tests/integrated/v3/api_samples/server-ips/server-post-req.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/server-ips/server-post-req.xml.tpl
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(host)s/openstack/images/%(image_id)s" flavor_ref="%(host)s/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(glance_host)s/images/%(image_id)s" flavor_ref="%(host)s/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
 </server>
diff --git a/nova/tests/integrated/v3/api_samples/server-metadata/server-post-req.json.tpl b/nova/tests/integrated/v3/api_samples/server-metadata/server-post-req.json.tpl
index 1dcb63e3b2..d9a7537dfb 100644
--- a/nova/tests/integrated/v3/api_samples/server-metadata/server-post-req.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/server-metadata/server-post-req.json.tpl
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "%(host)s/openstack/images/%(image_id)s",
-        "flavor_ref" : "%(host)s/openstack/flavors/1",
+        "image_ref" : "%(glance_host)s/images/%(image_id)s",
+        "flavor_ref" : "%(host)s/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
 }
diff --git a/nova/tests/integrated/v3/api_samples/server-metadata/server-post-req.xml.tpl b/nova/tests/integrated/v3/api_samples/server-metadata/server-post-req.xml.tpl
index ddb5ea78c4..eb788b2a7a 100644
--- a/nova/tests/integrated/v3/api_samples/server-metadata/server-post-req.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/server-metadata/server-post-req.xml.tpl
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(host)s/openstack/images/%(image_id)s" flavor_ref="%(host)s/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(glance_host)s/images/%(image_id)s" flavor_ref="%(host)s/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
 </server>
diff --git a/nova/tests/integrated/v3/api_samples/servers/server-post-req.json.tpl b/nova/tests/integrated/v3/api_samples/servers/server-post-req.json.tpl
index b1013defdf..d9a7537dfb 100644
--- a/nova/tests/integrated/v3/api_samples/servers/server-post-req.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/servers/server-post-req.json.tpl
@@ -1,16 +1,10 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "image_ref" : "%(glance_host)s/openstack/images/%(image_id)s",
-        "flavor_ref" : "%(host)s/openstack/flavors/1",
+        "image_ref" : "%(glance_host)s/images/%(image_id)s",
+        "flavor_ref" : "%(host)s/flavors/1",
         "metadata" : {
             "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
     }
 }
diff --git a/nova/tests/integrated/v3/api_samples/servers/server-post-req.xml.tpl b/nova/tests/integrated/v3/api_samples/servers/server-post-req.xml.tpl
index c7c6e31bb5..eb788b2a7a 100644
--- a/nova/tests/integrated/v3/api_samples/servers/server-post-req.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/servers/server-post-req.xml.tpl
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(glance_host)s/openstack/images/%(image_id)s" flavor_ref="%(host)s/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="%(glance_host)s/images/%(image_id)s" flavor_ref="%(host)s/flavors/1" name="new-server-test">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
-  <personality>
-    <file path="/etc/banner.txt">
-        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
-        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
-        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
-        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
-        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
-        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
-        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
-        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
-        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
-    </file>
-  </personality>
 </server>