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/11/05 20:05:21 UTC
[3/7] git commit: Unify argument order in crate_node: AWS, OpenStack
Unify argument order in crate_node: AWS, OpenStack
Signed-off-by: Tomaz Muraus <to...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/e1124b01
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/e1124b01
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/e1124b01
Branch: refs/heads/trunk
Commit: e1124b0102dc44d31346c2eee753791ebbd4be2d
Parents: 53a6743
Author: Ivan Kusalic <iv...@ikusalic.com>
Authored: Tue Sep 10 12:10:18 2013 +0200
Committer: Tomaz Muraus <to...@apache.org>
Committed: Tue Nov 5 18:55:36 2013 +0000
----------------------------------------------------------------------
libcloud/compute/drivers/ec2.py | 16 ++++++++--------
libcloud/compute/drivers/openstack.py | 24 ++++++++++++------------
2 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/e1124b01/libcloud/compute/drivers/ec2.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py
index 03b9bec..003d7ef 100644
--- a/libcloud/compute/drivers/ec2.py
+++ b/libcloud/compute/drivers/ec2.py
@@ -1556,21 +1556,21 @@ class BaseEC2NodeDriver(NodeDriver):
@inherits: :class:`NodeDriver.create_node`
- :keyword ex_mincount: Minimum number of instances to launch
- :type ex_mincount: ``int``
+ :keyword ex_keyname: The name of the key pair
+ :type ex_keyname: ``str``
- :keyword ex_maxcount: Maximum number of instances to launch
- :type ex_maxcount: ``int``
+ :keyword ex_userdata: User data
+ :type ex_userdata: ``str``
:keyword ex_security_groups: A list of names of security groups to
assign to the node.
:type ex_security_groups: ``list``
- :keyword ex_keyname: The name of the key pair
- :type ex_keyname: ``str``
+ :keyword ex_mincount: Minimum number of instances to launch
+ :type ex_mincount: ``int``
- :keyword ex_userdata: User data
- :type ex_userdata: ``str``
+ :keyword ex_maxcount: Maximum number of instances to launch
+ :type ex_maxcount: ``int``
:keyword ex_clienttoken: Unique identifier to ensure idempotency
:type ex_clienttoken: ``str``
http://git-wip-us.apache.org/repos/asf/libcloud/blob/e1124b01/libcloud/compute/drivers/openstack.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/openstack.py b/libcloud/compute/drivers/openstack.py
index d9da773..bb96828 100644
--- a/libcloud/compute/drivers/openstack.py
+++ b/libcloud/compute/drivers/openstack.py
@@ -1188,15 +1188,7 @@ class OpenStack_1_1_NodeDriver(OpenStackNodeDriver):
@inherits: :class:`NodeDriver.create_node`
- :keyword ex_metadata: Key/Value metadata to associate with a node
- :type ex_metadata: ``dict``
-
- :keyword ex_files: File Path => File contents to create on
- the no de
- :type ex_files: ``dict``
-
- :keyword ex_keyname: Name of existing public key to inject into
- instance
+ :keyword ex_keyname: The name of the key pair
:type ex_keyname: ``str``
:keyword ex_userdata: String containing user data
@@ -1204,14 +1196,22 @@ class OpenStack_1_1_NodeDriver(OpenStackNodeDriver):
https://help.ubuntu.com/community/CloudInit
:type ex_userdata: ``str``
- :keyword networks: The server is launched into a set of Networks.
- :type networks: :class:`OpenStackNetwork`
-
:keyword ex_security_groups: List of security groups to assign to
the node
:type ex_security_groups: ``list`` of
:class:`OpenStackSecurityGroup`
+ :keyword ex_metadata: Key/Value metadata to associate with a node
+ :type ex_metadata: ``dict``
+
+ :keyword ex_files: File Path => File contents to create on
+ the no de
+ :type ex_files: ``dict``
+
+
+ :keyword networks: The server is launched into a set of Networks.
+ :type networks: :class:`OpenStackNetwork`
+
:keyword ex_disk_config: Name of the disk configuration.
Can be either ``AUTO`` or ``MANUAL``.
:type ex_disk_config: ``str``