diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-get-resp-rescue.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-get-resp-rescue.json
new file mode 100644
index 000000000..bfa787ba1
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-get-resp-rescue.json
@@ -0,0 +1,53 @@
+{
+ "server": {
+ "accessIPv4": "",
+ "accessIPv6": "",
+ "addresses": {
+ "private": [
+ {
+ "addr": "192.168.0.3",
+ "version": 4
+ }
+ ]
+ },
+ "created": "2012-09-19T09:22:27Z",
+ "flavor": {
+ "id": "1",
+ "links": [
+ {
+ "href": "http://openstack.example.com/openstack/flavors/1",
+ "rel": "bookmark"
+ }
+ ]
+ },
+ "hostId": "c02c15d17499304e9893d9fc41c415f5096f8aa880bc651cac092650",
+ "id": "7e21a264-6cc1-4d90-b7b5-f9f49cec3a85",
+ "image": {
+ "id": "70a599e0-31e7-49b7-b260-868f441e862b",
+ "links": [
+ {
+ "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
+ "rel": "bookmark"
+ }
+ ]
+ },
+ "links": [
+ {
+ "href": "http://openstack.example.com/v2/openstack/servers/7e21a264-6cc1-4d90-b7b5-f9f49cec3a85",
+ "rel": "self"
+ },
+ {
+ "href": "http://openstack.example.com/openstack/servers/7e21a264-6cc1-4d90-b7b5-f9f49cec3a85",
+ "rel": "bookmark"
+ }
+ ],
+ "metadata": {
+ "My Server Name": "Apache1"
+ },
+ "name": "new-server-test",
+ "status": "RESCUE",
+ "tenant_id": "openstack",
+ "updated": "2012-09-19T09:22:27Z",
+ "user_id": "fake"
+ }
+}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-get-resp-rescue.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-get-resp-rescue.xml
new file mode 100644
index 000000000..3c45aaf2f
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-get-resp-rescue.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+ Apache1
+
+
+
+
+
+
+
+
+
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-rescue-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-rescue-req.json
new file mode 100644
index 000000000..8a4ad0d52
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-rescue-req.json
@@ -0,0 +1,6 @@
+{
+ "rescue": {
+ "adminPass": "MySecretPass",
+ "rescue_image_ref": "70a599e0-31e7-49b7-b260-868f441e862b"
+ }
+}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-rescue-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-rescue-req.xml
new file mode 100644
index 000000000..798e2282b
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-rescue-req.xml
@@ -0,0 +1,3 @@
+
+
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-rescue.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-rescue.json
new file mode 100644
index 000000000..a023c720b
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-rescue.json
@@ -0,0 +1,3 @@
+{
+ "adminPass": "MySecretPass"
+}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-rescue.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-rescue.xml
new file mode 100644
index 000000000..f3235dc0c
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-rescue.xml
@@ -0,0 +1,2 @@
+
+MySecretPass
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-actions-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-actions-v2.1.wadl
index 4d5ab5f5d..3dfb3235d 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-actions-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-actions-v2.1.wadl
@@ -30,6 +30,7 @@
+
@@ -228,12 +229,14 @@
After you make this request, you typically must keep polling
- the created image's status to determine whether the request
- succeeded. A successfully creating image operation shows an
- image's status of available and the serve's
- status goes back to the original status. You can also see the
- new image in the image back end that OpenStack Image service
- manages.
+ the status of the created image to determine whether the
+ request succeeded.
+
+
+ If the operation succeeds, the created image has a status of
+ available and the server status returns to the
+ original status. You can also see the new image in the image
+ back end that OpenStack Image service manages.
Preconditions
@@ -445,5 +448,91 @@
&commonFaults;
- &getFaults; &postPutFaults; &buildFaults; &inProgressFault;
+ &getFaults; &postPutFaults; &buildFaults; &inProgressFault;
+
+
+
+
+ Puts a server in rescue mode and changes its status to
+ RESCUE.
+
+
+ If you specify the rescue_image_ref extended
+ attribute, the specified image is used to rescue the instance.
+ If you omit an image reference, the base image reference is
+ used by default.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Specify the rescue
+ action in the request
+ body.
+
+
+
+
+ The password for the rescued instance. If you omit
+ this parameter, the operation generates a new
+ password.
+
+
+
+
+
+
+ The image reference to use to rescue your server
+ instance. Specify the image reference by ID or
+ full URL.
+
+
+ If you omit an image reference, default is the
+ base image reference.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+