summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-02-22 20:58:23 +0000
committerGerrit Code Review <review@openstack.org>2018-02-22 20:58:23 +0000
commit84a661d343a01c4da606ddadf3e9e765a8ed5041 (patch)
treec2ed6416d06cf5fab02db433feebf5a6c33817a1
parentcac6ab8c10a3411168f8c187ab0da613b40eff58 (diff)
parent9abccf8f77d264a8d3753df6cbc235e36e1e99a3 (diff)
Merge "Clarify `resources` query param for /r_p and /a_c"HEADmaster
-rw-r--r--placement-api-ref/source/parameters.yaml6
1 files changed, 3 insertions, 3 deletions
diff --git a/placement-api-ref/source/parameters.yaml b/placement-api-ref/source/parameters.yaml
index 6c1e87b..51a300d 100644
--- a/placement-api-ref/source/parameters.yaml
+++ b/placement-api-ref/source/parameters.yaml
@@ -104,7 +104,7 @@ resources_query:
104 description: | 104 description: |
105 A comma-separated list of strings indicating an amount of 105 A comma-separated list of strings indicating an amount of
106 resource of a specified class that a provider must have the 106 resource of a specified class that a provider must have the
107 capacity to serve:: 107 capacity and availability to serve::
108 108
109 resources=VCPU:4,DISK_GB:64,MEMORY_MB:2048 109 resources=VCPU:4,DISK_GB:64,MEMORY_MB:2048
110 min_version: 1.4 110 min_version: 1.4
@@ -114,8 +114,8 @@ resources_query_required:
114 required: true 114 required: true
115 description: | 115 description: |
116 A comma-separated list of strings indicating an amount of 116 A comma-separated list of strings indicating an amount of
117 resource of a specified class that a provider must have the 117 resource of a specified class that providers in each allocation request
118 capacity to serve:: 118 must *collectively* have the capacity and availability to serve::
119 119
120 resources=VCPU:4,DISK_GB:64,MEMORY_MB:2048 120 resources=VCPU:4,DISK_GB:64,MEMORY_MB:2048
121trait_associated: 121trait_associated: