You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2013/08/29 16:19:43 UTC

[4/4] git commit: docs: Fix broken example, remove now obsolete text.

docs: Fix broken example, remove now obsolete text.


Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/b6fa496d
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/b6fa496d
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/b6fa496d

Branch: refs/heads/trunk
Commit: b6fa496d7010938519e6fdecdbbf60674e7d9321
Parents: 66bdec2
Author: Tomaz Muraus <to...@apache.org>
Authored: Thu Aug 29 16:15:20 2013 +0200
Committer: Tomaz Muraus <to...@apache.org>
Committed: Thu Aug 29 16:15:20 2013 +0200

----------------------------------------------------------------------
 docs/compute/examples.rst                                    | 8 ++------
 .../compute/create_cloudstack_node_keypair_secgroup.py       | 4 ++--
 2 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/b6fa496d/docs/compute/examples.rst
----------------------------------------------------------------------
diff --git a/docs/compute/examples.rst b/docs/compute/examples.rst
index 6d71233..86f1efd 100644
--- a/docs/compute/examples.rst
+++ b/docs/compute/examples.rst
@@ -100,8 +100,8 @@ Create a node on a CloudStack provider using a provided key pair and security gr
 
     This example assumes the provided key pair already exists. If the key pair
     doesn't exist yet, you can create it using the provider's own UI, or
-    :func:`ex_create_keypair` driver method. This functionality is only available
-    in trunk.
+    :func:`ex_create_keypair` driver method.
+    This functionality is currently only available in trunk.
 
 This example demonstrates how to create a node using an existing key pair.
 Created node also gets added to the provided security groups.
@@ -109,10 +109,6 @@ Created node also gets added to the provided security groups.
 .. literalinclude:: /examples/compute/create_cloudstack_node_keypair_secgroup.py
    :language: python
 
-As noted in the example, you use `extra_args` argument to provide a dictionary that
-contains the keypair and list of securitygroups. Note that the list of securitygroups
-is passed as a string not as a python list.
-
 Create flaoting IP and attach it to a node using a local OpenStack provider
 ---------------------------------------------------------------------------
 

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b6fa496d/docs/examples/compute/create_cloudstack_node_keypair_secgroup.py
----------------------------------------------------------------------
diff --git a/docs/examples/compute/create_cloudstack_node_keypair_secgroup.py b/docs/examples/compute/create_cloudstack_node_keypair_secgroup.py
index 8f04410..b912fbf 100644
--- a/docs/examples/compute/create_cloudstack_node_keypair_secgroup.py
+++ b/docs/examples/compute/create_cloudstack_node_keypair_secgroup.py
@@ -7,7 +7,7 @@ HOST = 'hostname or ip address of your management server'
 PATH = 'path to the api endpoint, e.g: /client/api'
 
 SIZE_ID = 'id of the computer offering you want to use'
-TEMPLATE_ID = 'id of the template you want to use'
+IMAGE_ID = 'id of the template you want to use'
 
 # Name of the existing keypair you want to use
 KEYPAIR_NAME = 'keypairname'
@@ -17,7 +17,7 @@ SECURITY_GROUP_NAMES = ['secgroup1', 'secgroup2']
 
 cls = get_driver(Provider.CLOUDSTACK)
 driver = cls(key=ACCESS_ID, secret=SECRET_KEY, secure=True,
-             host=HOST, path=PATH, extra_args=EXTRA_ARGS)
+             host=HOST, path=PATH)
 
 sizes = driver.list_sizes()
 images = driver.list_images()