Merge "Add trusted_image_certificates to REST API"

api-ref/source/parameters.yaml

@@ -5720,6 +5720,40 @@ server_tags_create:
   required: false
   type: array
   min_version: 2.52
+server_trusted_image_certificates_create_req:
+  description: |
+    A list of trusted certificate IDs, which are used during image
+    signature verification to verify the signing certificate. The list is
+    restricted to a maximum of 50 IDs. This parameter is optional in server
+    create requests if allowed by policy, and is not supported for
+    volume-backed instances.
+  in: body
+  required: false
+  type: array
+  min_version: 2.63
+server_trusted_image_certificates_rebuild_req:
+  description: |
+    A list of trusted certificate IDs, which are used during image
+    signature verification to verify the signing certificate. The list is
+    restricted to a maximum of 50 IDs. This parameter is optional in server
+    rebuild requests if allowed by policy, and is not supported
+    for volume-backed instances.
+
+    If ``null`` is specified, the existing trusted certificate IDs are either
+    unset or reset to the configured defaults.
+  in: body
+  required: false
+  type: array
+  min_version: 2.63
+server_trusted_image_certificates_resp:
+  description: |
+    A list of trusted certificate IDs, that were used during image signature
+    verification to verify the signing certificate. The list is restricted
+    to a maximum of 50 IDs.
+  in: body
+  required: true
+  type: array
+  min_version: 2.63
 server_usages:
   description: |
     A list of the server usage objects.

api-ref/source/servers-actions.inc

@@ -488,10 +488,11 @@ Request
   - description: server_description
   - key_name: key_name_rebuild_req
   - user_data: user_data_rebuild_req
+  - trusted_image_certificates: server_trusted_image_certificates_rebuild_req
 
-**Example Rebuild Server (rebuild Action) (v2.54)**
+**Example Rebuild Server (rebuild Action) (v2.63)**
 
-.. literalinclude:: ../../doc/api_samples/servers/v2.54/server-action-rebuild.json
+.. literalinclude:: ../../doc/api_samples/servers/v2.63/server-action-rebuild.json
    :language: javascript
 
 Response
@@ -537,10 +538,11 @@ Response
   - tags: tags
   - key_name: key_name_rebuild_resp
   - user_data: user_data_rebuild_resp
+  - trusted_image_certificates: server_trusted_image_certificates_resp
 
-**Example Rebuild Server (rebuild Action) (v2.54)**
+**Example Rebuild Server (rebuild Action) (v2.63)**
 
-.. literalinclude:: ../../doc/api_samples/servers/v2.54/server-action-rebuild-resp.json
+.. literalinclude:: ../../doc/api_samples/servers/v2.63/server-action-rebuild-resp.json
    :language: javascript
 
 Remove (Disassociate) Floating Ip (removeFloatingIp Action) (DEPRECATED)

api-ref/source/servers.inc

@@ -381,6 +381,7 @@ Request
   - os:scheduler_hints.query: os:scheduler_hints_query
   - os:scheduler_hints.same_host: os:scheduler_hints_same_host
   - os:scheduler_hints.target_cell: os:scheduler_hints_target_cell
+  - trusted_image_certificates: server_trusted_image_certificates_create_req
 
 **Example Create Server**
 
@@ -392,6 +393,11 @@ Request
 .. literalinclude:: ../../doc/api_samples/servers/v2.37/server-create-req.json
    :language: javascript
 
+**Example Create Server With Trusted Image Certificates (v2.63)**
+
+.. literalinclude:: ../../doc/api_samples/servers/v2.63/server-create-req.json
+   :language: javascript
+
 Response
 --------
 
@@ -610,10 +616,11 @@ Response
   - host_status: host_status
   - description: server_description_resp
   - tags: tags
+  - trusted_image_certificates: server_trusted_image_certificates_resp
 
-**Example List Servers Detailed (2.47)**
+**Example List Servers Detailed (2.63)**
 
-.. literalinclude:: /../../doc/api_samples/servers/v2.47/servers-details-resp.json
+.. literalinclude:: /../../doc/api_samples/servers/v2.63/servers-details-resp.json
    :language: javascript
 
 
@@ -716,10 +723,11 @@ Response
   - host_status: host_status
   - description: server_description_resp
   - tags: tags
+  - trusted_image_certificates: server_trusted_image_certificates_resp
 
-**Example Show Server Details (2.47)**
+**Example Show Server Details (2.63)**
 
-.. literalinclude:: ../../doc/api_samples/servers/v2.47/server-get-resp.json
+.. literalinclude:: ../../doc/api_samples/servers/v2.63/server-get-resp.json
    :language: javascript
 
 Update Server
@@ -808,10 +816,11 @@ Response
   - locked: locked
   - description: server_description_resp
   - tags: tags
+  - trusted_image_certificates: server_trusted_image_certificates_resp
 
-**Example Update server name (2.47)**
+**Example Update server name (2.63)**
 
-.. literalinclude:: ../../doc/api_samples/servers/v2.47/server-update-resp.json
+.. literalinclude:: ../../doc/api_samples/servers/v2.63/server-update-resp.json
    :language: javascript
 
 Delete Server