From 3c517ae1f409168d0c006e48ed591cce7de634be Mon Sep 17 00:00:00 2001 From: Chris Yeoh Date: Tue, 19 Nov 2013 11:43:02 +1030 Subject: [PATCH] Remove traces of V3 personality extension from api samples Removes occurences of the personality extension from the V3 API samples as the extension has been removed. Cleanup of consistency of image and flavor ref examples for the api samples. DocImpact Partially implements blueprint v3-api-remove-extensions Change-Id: I43a34097904d3d7e280039c3d5d76479a49e92d0 --- .../all_extensions/server-post-req.json | 14 ++++---------- .../all_extensions/server-post-req.xml | 17 ++--------------- .../api_samples/consoles/server-post-req.json | 14 ++++---------- doc/v3/api_samples/consoles/server-post-req.xml | 17 ++--------------- .../os-admin-actions/server-post-req.json | 10 ++-------- .../os-admin-actions/server-post-req.xml | 15 +-------------- .../os-admin-password/server-post-req.json | 14 ++++---------- .../os-admin-password/server-post-req.xml | 17 ++--------------- .../os-attach-interfaces/server-post-req.json | 14 ++++---------- .../os-attach-interfaces/server-post-req.xml | 17 ++--------------- .../os-config-drive/server-post-req.json | 14 ++++---------- .../os-config-drive/server-post-req.xml | 17 ++--------------- .../os-console-output/server-post-req.json | 14 ++++---------- .../os-console-output/server-post-req.xml | 17 ++--------------- .../os-deferred-delete/server-post-req.json | 14 ++++---------- .../os-deferred-delete/server-post-req.xml | 17 ++--------------- .../os-disk-config/server-post-req.json | 14 ++++---------- .../os-disk-config/server-post-req.xml | 17 ++--------------- .../os-evacuate/server-post-req.json | 12 +++--------- .../api_samples/os-evacuate/server-post-req.xml | 17 ++--------------- .../server-post-req.json | 10 ++-------- .../server-post-req.xml | 15 +-------------- .../server-post-req.json | 10 ++-------- .../server-post-req.xml | 15 +-------------- .../os-extended-status/server-post-req.json | 10 ++-------- .../os-extended-status/server-post-req.xml | 15 +-------------- .../os-extended-volumes/server-post-req.json | 10 ++-------- .../os-extended-volumes/server-post-req.xml | 15 +-------------- .../server-post-req.json | 14 ++++---------- .../server-post-req.xml | 17 ++--------------- .../os-multinic/server-post-req.json | 14 ++++---------- .../api_samples/os-multinic/server-post-req.xml | 17 ++--------------- .../os-remote-consoles/server-post-req.json | 14 ++++---------- .../os-remote-consoles/server-post-req.xml | 17 ++--------------- .../api_samples/os-rescue/server-post-req.json | 14 ++++---------- .../api_samples/os-rescue/server-post-req.xml | 17 ++--------------- .../os-security-groups/server-post-req.json | 8 +------- .../os-security-groups/server-post-req.xml | 15 +-------------- .../os-server-diagnostics/server-post-req.json | 14 ++++---------- .../os-server-diagnostics/server-post-req.xml | 17 ++--------------- .../os-server-usage/server-post-req.json | 12 +++--------- .../os-server-usage/server-post-req.xml | 17 ++--------------- .../os-simple-tenant-usage/server-post-req.json | 14 ++++---------- .../os-simple-tenant-usage/server-post-req.xml | 17 ++--------------- .../os-user-data/userdata-post-req.json | 10 ++-------- .../os-user-data/userdata-post-req.xml | 15 +-------------- .../api_samples/server-ips/server-post-req.json | 14 ++++---------- .../api_samples/server-ips/server-post-req.xml | 17 ++--------------- .../server-metadata/server-post-req.json | 14 ++++---------- .../server-metadata/server-post-req.xml | 17 ++--------------- doc/v3/api_samples/servers/server-post-req.json | 14 ++++---------- doc/v3/api_samples/servers/server-post-req.xml | 17 ++--------------- 52 files changed, 132 insertions(+), 626 deletions(-) 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 d41985a1b..2eedab614 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 598839cf6..2a0b4ace7 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 @@ - + Apache1 - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file + diff --git a/doc/v3/api_samples/consoles/server-post-req.json b/doc/v3/api_samples/consoles/server-post-req.json index d41985a1b..2eedab614 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 598839cf6..2a0b4ace7 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 @@ - + Apache1 - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file + 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 30851df41..2eedab614 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 24eabe853..2a0b4ace7 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 @@ Apache1 - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file + 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 d41985a1b..2eedab614 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 598839cf6..2a0b4ace7 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 @@ - + Apache1 - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file + 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 d41985a1b..2eedab614 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 598839cf6..2a0b4ace7 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 @@ - + Apache1 - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file + 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 d41985a1b..2eedab614 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 598839cf6..2a0b4ace7 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 @@ - + Apache1 - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file + 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 d41985a1b..2eedab614 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 598839cf6..2a0b4ace7 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 @@ - + Apache1 - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file + 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 d41985a1b..2eedab614 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 598839cf6..2a0b4ace7 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 @@ - + Apache1 - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file + 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 d41985a1b..2eedab614 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 598839cf6..2a0b4ace7 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 @@ - + Apache1 - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file + 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 33a715656..2eedab614 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 ac49b9cb6..2a0b4ace7 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 @@ - + Apache1 - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file + 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 30851df41..2eedab614 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 24eabe853..2a0b4ace7 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 @@ Apache1 - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file + 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 30851df41..2eedab614 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 24eabe853..2a0b4ace7 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 @@ Apache1 - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file + 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 30851df41..2eedab614 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 24eabe853..2a0b4ace7 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 @@ Apache1 - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file + 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 30851df41..2eedab614 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 24eabe853..2a0b4ace7 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 @@ Apache1 - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file + 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 d41985a1b..2eedab614 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 598839cf6..2a0b4ace7 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 @@ - + Apache1 - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file + 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 d41985a1b..2eedab614 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 598839cf6..2a0b4ace7 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 @@ - + Apache1 - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file + 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 d41985a1b..2eedab614 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 598839cf6..2a0b4ace7 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 @@ - + Apache1 - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file + 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 d41985a1b..2eedab614 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 598839cf6..2a0b4ace7 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 @@ - + Apache1 - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file + 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 cd323c6ff..428217cfc 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 6494a574f..d749f13fa 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 @@ Apache1 - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file + 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 d41985a1b..2eedab614 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 598839cf6..2a0b4ace7 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 @@ - + Apache1 - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file + 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 dbab73df0..2eedab614 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 57cc14ea0..2a0b4ace7 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 @@ - + Apache1 - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file + 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 d41985a1b..2eedab614 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 598839cf6..2a0b4ace7 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 @@ - + Apache1 - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file + 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 875862be4..21ca21b6d 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 95a6b41b1..42906c482 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 @@ Apache1 - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file + 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 d41985a1b..2eedab614 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 598839cf6..2a0b4ace7 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 @@ - + Apache1 - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file + 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 d41985a1b..2eedab614 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 598839cf6..2a0b4ace7 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 @@ - + Apache1 - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file + diff --git a/doc/v3/api_samples/servers/server-post-req.json b/doc/v3/api_samples/servers/server-post-req.json index d41985a1b..2eedab614 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 598839cf6..2a0b4ace7 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 @@ - + Apache1 - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - \ No newline at end of file +