Merge pull request #133 from opdemand/128-sphinx-task-decorator

mboersma · mboersma · commit df4d7bf11c9c · 2013-08-23T14:26:11.000-07:00
Fixed Sphinx docs for functions decorated with @task
diff --git a/docs/server/celerytasks.azuresms.rst b/docs/server/celerytasks.azuresms.rst
@@ -14,3 +14,7 @@ celerytasks.azuresms
 .. automodule:: celerytasks.azuresms
     :members:
     :undoc-members:
+
+    .. autofunction:: launch_node(node_id, creds, params, init, ssh_username, ssh_private_key)
+    .. autofunction:: terminate_node(node_id, creds, params, provider_id)
+    .. autofunction:: converge_node(node_id, ssh_username, fqdn, ssh_private_key, command='sudo chef-client')
diff --git a/docs/server/celerytasks.controller.rst b/docs/server/celerytasks.controller.rst
@@ -12,3 +12,7 @@ celerytasks.controller
 .. automodule:: celerytasks.controller
     :members:
     :undoc-members:
+
+    .. autofunction:: update_gitosis(databag_item_value)
+    .. autofunction:: update_formation(formation_id, databag_item_value)
+    .. autofunction:: destroy_formation(formation_id)
diff --git a/docs/server/celerytasks.ec2.rst b/docs/server/celerytasks.ec2.rst
@@ -12,3 +12,10 @@ celerytasks.ec2
 .. automodule:: celerytasks.ec2
     :members:
     :undoc-members:
+
+    .. autofunction:: build_layer(layer, creds, params)
+    .. autofunction:: destroy_layer(layer, creds, params)
+    .. autofunction:: launch_node(node_id, creds, params, init, ssh_username, ssh_private_key)
+    .. autofunction:: terminate_node(node_id, creds, params, provider_id)
+    .. autofunction:: converge_node(node_id, ssh_username, fqdn, ssh_private_key, command='sudo chef-client')
+    .. autofunction:: run_node(node_id, ssh_username, fqdn, ssh_private_key, docker_args, command)
diff --git a/docs/server/celerytasks.mock.rst b/docs/server/celerytasks.mock.rst
@@ -12,3 +12,10 @@ celerytasks.mock
 .. automodule:: celerytasks.mock
     :members:
     :undoc-members:
+
+    .. autofunction:: build_layer(layer, creds, params)
+    .. autofunction:: destroy_layer(layer, creds, params)
+    .. autofunction:: launch_node(node_id, creds, params, init, ssh_username, ssh_private_key)
+    .. autofunction:: terminate_node(node_id, creds, params, provider_id)
+    .. autofunction:: converge_node(node_id, ssh_username, fqdn, ssh_private_key)
+    .. autofunction:: run_node(node_id, ssh_username, fqdn, ssh_private_key, docker_args, command)
diff --git a/docs/server/index.rst b/docs/server/index.rst
@@ -32,6 +32,5 @@ Server Reference
     celerytasks.mock
     celerytasks.util
 
-    web.models
     web.urls
     web.views
diff --git a/docs/server/web.models.rst b/docs/server/web.models.rst
