Mirror X-Trans-Id to X-Openstack-Request-Id

Many other OpenStack services use a `[X-]OpenStack-Request-Id` header
to return a unique identifier for the request.  Swift will now return
`X-Trans-Id` as well as `X-Openstack-Request-Id`.

Change-Id: I56cd4738808b99c0a08463f83c100be51a62db05
Closes-Bug: #1572786

6 files changed, 23 insertions, 4 deletions

diff --git a/api-ref/source/parameters.yaml b/api-ref/source/parameters.yaml
index d69f866b9..23ab88a1a 100644
--- a/api-ref/source/parameters.yaml
+++ b/api-ref/source/parameters.yaml
@@ -732,6 +732,14 @@ X-Object-Meta-name_resp:
   in: header
   required: false
   type: string
+X-Openstack-Request-Id:
+  description: |
+    A unique transaction ID for this request. Your
+    service provider might need this value if you report a problem.
+    (same as ``X-Trans-Id``)
+  in: header
+  required: true
+  type: string
 X-Remove-Account-name:
   description: |
     Removes the metadata item named ``name``.
diff --git a/api-ref/source/samples/account-containers-list-http-response-json.txt b/api-ref/source/samples/account-containers-list-http-response-json.txt
index 0cdba62a8..6c86e00ca 100644
--- a/api-ref/source/samples/account-containers-list-http-response-json.txt
+++ b/api-ref/source/samples/account-containers-list-http-response-json.txt
@@ -8,4 +8,5 @@ X-Account-Container-Count: 2
 Content-Type: application/json; charset=utf-8
 Accept-Ranges: bytes
 X-Trans-Id: tx274a77a8975c4a66aeb24-0052d95365
-Date: Fri, 17 Jan 2014 15:59:33 GMT
\ No newline at end of file
+X-Openstack-Request-Id: tx274a77a8975c4a66aeb24-0052d95365
+Date: Fri, 17 Jan 2014 15:59:33 GMT
diff --git a/api-ref/source/samples/account-containers-list-http-response-xml.txt b/api-ref/source/samples/account-containers-list-http-response-xml.txt
index 6ad781aae..c47763856 100644
--- a/api-ref/source/samples/account-containers-list-http-response-xml.txt
+++ b/api-ref/source/samples/account-containers-list-http-response-xml.txt
@@ -8,4 +8,5 @@ X-Account-Container-Count: 2
 Content-Type: application/xml; charset=utf-8
 Accept-Ranges: bytes
 X-Trans-Id: tx69f60bc9f7634a01988e6-0052d9544b
-Date: Fri, 17 Jan 2014 16:03:23 GMT
\ No newline at end of file
+X-Openstack-Request-Id: tx69f60bc9f7634a01988e6-0052d9544b
+Date: Fri, 17 Jan 2014 16:03:23 GMT
diff --git a/api-ref/source/samples/objects-list-http-response-json.txt b/api-ref/source/samples/objects-list-http-response-json.txt
index 2efe63a3f..aa0f6b429 100644
--- a/api-ref/source/samples/objects-list-http-response-json.txt
+++ b/api-ref/source/samples/objects-list-http-response-json.txt
@@ -7,4 +7,5 @@ X-Timestamp: 1389727543.65372
 X-Container-Bytes-Used: 26
 Content-Type: application/json; charset=utf-8
 X-Trans-Id: tx26377fe5fab74869825d1-0052d6bdff
-Date: Wed, 15 Jan 2014 16:57:35 GMT
\ No newline at end of file
+X-Openstack-Request-Id: tx26377fe5fab74869825d1-0052d6bdff
+Date: Wed, 15 Jan 2014 16:57:35 GMT
diff --git a/api-ref/source/samples/objects-list-http-response-xml.txt b/api-ref/source/samples/objects-list-http-response-xml.txt
index eb17bb2a6..b9804cb58 100644
--- a/api-ref/source/samples/objects-list-http-response-xml.txt
+++ b/api-ref/source/samples/objects-list-http-response-xml.txt
@@ -7,4 +7,5 @@ X-Timestamp: 1389727543.65372
 X-Container-Bytes-Used: 26
 Content-Type: application/xml; charset=utf-8
 X-Trans-Id: txc75ea9a6e66f47d79e0c5-0052d6be76
-Date: Wed, 15 Jan 2014 16:59:35 GMT
\ No newline at end of file
+X-Openstack-Request-Id: txc75ea9a6e66f47d79e0c5-0052d6be76
+Date: Wed, 15 Jan 2014 16:59:35 GMT
diff --git a/api-ref/source/storage-account-services.inc b/api-ref/source/storage-account-services.inc
index e792b814b..8834c1a6d 100644
--- a/api-ref/source/storage-account-services.inc
+++ b/api-ref/source/storage-account-services.inc
@@ -100,6 +100,7 @@ Response Parameters
    - X-Account-Meta-Temp-URL-Key-2: X-Account-Meta-Temp-URL-Key-2_resp
    - X-Timestamp: X-Timestamp
    - X-Trans-Id: X-Trans-Id
+   - X-Openstack-Request-Id: X-Openstack-Request-Id
    - Date: Date
    - X-Account-Bytes-Used: X-Account-Bytes-Used
    - X-Account-Container-Count: X-Account-Container-Count
@@ -194,6 +195,7 @@ Example requests and responses:
      Content-Length: 0
      Content-Type: text/html; charset=UTF-8
      X-Trans-Id: tx8c2dd6aee35442a4a5646-0052d954fb
+     X-Openstack-Request-Id: tx8c2dd6aee35442a4a5646-0052d954fb
      Date: Fri, 17 Jan 2014 16:06:19 GMT
 
 
@@ -212,6 +214,7 @@ Example requests and responses:
      Content-Length: 0
      Content-Type: text/html; charset=UTF-8
      X-Trans-Id: tx1439b96137364ab581156-0052d95532
+     X-Openstack-Request-Id: tx1439b96137364ab581156-0052d95532
      Date: Fri, 17 Jan 2014 16:07:14 GMT
 
 
@@ -230,6 +233,7 @@ Example requests and responses:
      Content-Length: 0
      Content-Type: text/html; charset=UTF-8
      X-Trans-Id: tx411cf57701424da99948a-0052d9556f
+     X-Openstack-Request-Id: tx411cf57701424da99948a-0052d9556f
      Date: Fri, 17 Jan 2014 16:08:15 GMT
 
 
@@ -266,6 +270,7 @@ Response Parameters
    - Content-Length: Content-Length_cud_resp
    - Content-Type: Content-Type_cud_resp
    - X-Trans-Id: X-Trans-Id
+   - X-Openstack-Request-Id: X-Openstack-Request-Id
 
 
 Show account metadata
@@ -312,6 +317,7 @@ Show account metadata request:
    Content-Type: text/plain; charset=utf-8
    Accept-Ranges: bytes
    X-Trans-Id: txafb3504870144b8ca40f7-0052d955d4
+   X-Openstack-Request-Id: txafb3504870144b8ca40f7-0052d955d4
    Date: Fri, 17 Jan 2014 16:09:56 GMT
 
 
@@ -344,6 +350,7 @@ Response Parameters
    - X-Account-Meta-Temp-URL-Key-2: X-Account-Meta-Temp-URL-Key-2_resp
    - X-Timestamp: X-Timestamp
    - X-Trans-Id: X-Trans-Id
+   - X-Openstack-Request-Id: X-Openstack-Request-Id
    - Date: Date
    - X-Account-Bytes-Used: X-Account-Bytes-Used
    - X-Account-Object-Count: X-Account-Object-Count