diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-15 20:14:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-15 20:14:14 +0000 |
| commit | 11f65872503e1779ece1d5f83a19627b23267235 (patch) | |
| tree | 9097d225be769ea8ea098982a75b8235beed4a6a /doc | |
| parent | 4aac62be597a90a908b28fcaeb2307e4a8eabf58 (diff) | |
| parent | 37c618da7c565b13cf6779f40c41ce895ff0459f (diff) | |
| download | nova-11f65872503e1779ece1d5f83a19627b23267235.tar.gz nova-11f65872503e1779ece1d5f83a19627b23267235.tar.xz nova-11f65872503e1779ece1d5f83a19627b23267235.zip | |
Merge "Make os-services API extensions consistent."
Diffstat (limited to 'doc')
4 files changed, 15 insertions, 11 deletions
diff --git a/doc/api_samples/os-services/service-disable-put-req.json b/doc/api_samples/os-services/service-disable-put-req.json index d11afaed9..f96d34536 100644 --- a/doc/api_samples/os-services/service-disable-put-req.json +++ b/doc/api_samples/os-services/service-disable-put-req.json @@ -1,4 +1,4 @@ { "host": "host1", - "service": "nova-compute" -}
\ No newline at end of file + "binary": "nova-compute" +} diff --git a/doc/api_samples/os-services/service-disable-put-resp.json b/doc/api_samples/os-services/service-disable-put-resp.json index 2e461bc6d..2c21c547f 100644 --- a/doc/api_samples/os-services/service-disable-put-resp.json +++ b/doc/api_samples/os-services/service-disable-put-resp.json @@ -1,5 +1,7 @@ { - "disabled": true, - "host": "host1", - "service": "nova-compute" -}
\ No newline at end of file + "service": { + "host": "host1", + "binary": "nova-compute", + "status": "disabled" + } +} diff --git a/doc/api_samples/os-services/service-enable-put-resp.json b/doc/api_samples/os-services/service-enable-put-resp.json index 88b9dc7f9..75c4ebd55 100644 --- a/doc/api_samples/os-services/service-enable-put-resp.json +++ b/doc/api_samples/os-services/service-enable-put-resp.json @@ -1,5 +1,7 @@ { - "disabled": false, - "host": "host1", - "service": "nova-compute" -}
\ No newline at end of file + "service": { + "host": "host1", + "binary": "nova-compute", + "status": "enabled" + } +} diff --git a/doc/api_samples/os-services/services-list-get-resp.json b/doc/api_samples/os-services/services-list-get-resp.json index dcda1a46e..572d5d863 100644 --- a/doc/api_samples/os-services/services-list-get-resp.json +++ b/doc/api_samples/os-services/services-list-get-resp.json @@ -33,4 +33,4 @@ "zone": "nova" } ] -}
\ No newline at end of file +} |