summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-10-01 12:10:51 +0000
committerGerrit Code Review <review@openstack.org>2018-10-01 12:10:51 +0000
commit1d0cdd288a7a9b3f0d61ff1ea1a6437eafa05b7f (patch)
tree707ff633c4ad422ef9b44f2f490faa12bd8fb824
parentbfe65fe1e895ad376738fc6958d0223e975c12de (diff)
parentbde6ee07df3ab1aebd3fc13a97ba552ea7aae3ef (diff)
Merge "Fix: various documentation and URL fixes"
-rw-r--r--specs/approved/k8s_update_node_labels_workflow.rst2
-rw-r--r--specs/approved/workflow_node-teardown.rst14
-rw-r--r--specs/implemented/deployment-grouping-baremetal.rst4
3 files changed, 10 insertions, 10 deletions
diff --git a/specs/approved/k8s_update_node_labels_workflow.rst b/specs/approved/k8s_update_node_labels_workflow.rst
index b46b96d..a363b47 100644
--- a/specs/approved/k8s_update_node_labels_workflow.rst
+++ b/specs/approved/k8s_update_node_labels_workflow.rst
@@ -241,4 +241,4 @@ References
241 241
242.. _Kubernetes: https://kubernetes.io/ 242.. _Kubernetes: https://kubernetes.io/
243.. _Kubernetes node labels: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ 243.. _Kubernetes node labels: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
244.. _Baremetal Nodes: https://airshipit.readthedocs.io/projects/drydock/en/latest/topology.html#host-profiles-and-baremetal-nodes 244.. _Baremetal Nodes: https://airship-drydock.readthedocs.io/en/latest/topology.html#host-profiles-and-baremetal-nodes
diff --git a/specs/approved/workflow_node-teardown.rst b/specs/approved/workflow_node-teardown.rst
index 21f1779..5c8f7e0 100644
--- a/specs/approved/workflow_node-teardown.rst
+++ b/specs/approved/workflow_node-teardown.rst
@@ -258,7 +258,7 @@ Query Parameters:
258 258
259Responses 259Responses
260~~~~~~~~~ 260~~~~~~~~~
261All responses will be form of the UCP Status response. 261All responses will be form of the Airship Status response.
262 262
263- Success: Code: 200, reason: Success 263- Success: Code: 200, reason: Success
264 264
@@ -293,7 +293,7 @@ Query Parameters:
293 293
294Responses 294Responses
295~~~~~~~~~ 295~~~~~~~~~
296All responses will be form of the UCP Status response. 296All responses will be form of the Airship Status response.
297 297
298- Success: Code: 200, reason: Success 298- Success: Code: 200, reason: Success
299 299
@@ -327,14 +327,14 @@ Query Parameters:
327 327
328Responses 328Responses
329~~~~~~~~~ 329~~~~~~~~~
330All responses will be form of the UCP Status response. 330All responses will be form of the Airship Status response.
331 331
332- Success: Code: 200, reason: Success 332- Success: Code: 200, reason: Success
333 333
334 The status of each etcd in the site will be returned in the details section. 334 The status of each etcd in the site will be returned in the details section.
335 Valid values for status are: Healthy, Unhealthy 335 Valid values for status are: Healthy, Unhealthy
336 336
337https://github.com/att-comdev/ucp-integration/blob/master/docs/source/api-conventions.rst#status-responses 337https://github.com/openstack/airship-in-a-bottle/blob/master/doc/source/api-conventions.rst#status-responses
338 338
339.. code:: json 339.. code:: json
340 340
@@ -395,7 +395,7 @@ label added, and then perform the kubelet teardown.
395 395
396Responses 396Responses
397~~~~~~~~~ 397~~~~~~~~~
398All responses will be form of the UCP Status response. 398All responses will be form of the Airship Status response.
399 399
400- Success: Code: 200, reason: Success 400- Success: Code: 200, reason: Success
401 401
@@ -428,7 +428,7 @@ respond with a 409 Conflict response.
428 428
429Responses 429Responses
430~~~~~~~~~ 430~~~~~~~~~
431All responses will be form of the UCP Status response. 431All responses will be form of the Airship Status response.
432 432
433- Success: Code: 200, reason: Success 433- Success: Code: 200, reason: Success
434 434
@@ -501,7 +501,7 @@ Enhancements
501 501
502 The completion tags should only be applied upon failure if the site action 502 The completion tags should only be applied upon failure if the site action
503 gets past document validation successfully (i.e. gets to the point where it 503 gets past document validation successfully (i.e. gets to the point where it
504 can start making changes via the other UCP components) 504 can start making changes via the other Airship components)
505 505
506 This could result in a single revision having both site-action-success and 506 This could result in a single revision having both site-action-success and
507 site-action-failure if a later re-invocation of a site action is successful. 507 site-action-failure if a later re-invocation of a site action is successful.
diff --git a/specs/implemented/deployment-grouping-baremetal.rst b/specs/implemented/deployment-grouping-baremetal.rst
index 10cfa87..312903a 100644
--- a/specs/implemented/deployment-grouping-baremetal.rst
+++ b/specs/implemented/deployment-grouping-baremetal.rst
@@ -50,7 +50,7 @@ update_site workflow (and perhaps other workflows in the future) invokes
50Drydock to verify the site, prepare the site, prepare the nodes, and deploy the 50Drydock to verify the site, prepare the site, prepare the nodes, and deploy the
51nodes. Each of these steps is described in the `Drydock Orchestrator Readme`_ 51nodes. Each of these steps is described in the `Drydock Orchestrator Readme`_
52 52
53.. _Drydock Orchestrator Readme: https://git.openstack.org/cgit/openstack/airship-drydock/plain/drydock_provisioner/orchestrator/readme.md 53.. _Drydock Orchestrator Readme: https://git.openstack.org/cgit/openstack/airship-drydock/tree/python/drydock_provisioner/orchestrator/readme.md
54 54
55The prepare nodes and deploy nodes steps each involve intensive and potentially 55The prepare nodes and deploy nodes steps each involve intensive and potentially
56time consuming operations on the target nodes, orchestrated by Drydock and 56time consuming operations on the target nodes, orchestrated by Drydock and
@@ -69,7 +69,7 @@ Some factors that advise this solution:
693. Miswiring or configuration of network hardware. 693. Miswiring or configuration of network hardware.
704. Incorrect site design causing a mismatch against the hardware. 704. Incorrect site design causing a mismatch against the hardware.
715. Criticality of particular nodes to the realization of the site design. 715. Criticality of particular nodes to the realization of the site design.
726. Desired configurability within the framework of the UCP declarative site 726. Desired configurability within the framework of the Airship declarative site
73 design. 73 design.
747. Improved visibility into the current state of node deployment. 747. Improved visibility into the current state of node deployment.
758. A desire to begin the deployment of nodes before the finish of the 758. A desire to begin the deployment of nodes before the finish of the