From dbe6d3524cf82a7c297fa7785f628f0d45dbc420 Mon Sep 17 00:00:00 2001 From: Ivan Kusalic Date: Tue, 10 Sep 2013 12:10:18 +0200 Subject: [PATCH 1/3] Unify argument order in crate_node: AWS, OpenStack --- libcloud/compute/drivers/ec2.py | 16 ++++++++-------- libcloud/compute/drivers/openstack.py | 24 ++++++++++++------------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py index c0d4250..870db4a 100644 --- a/libcloud/compute/drivers/ec2.py +++ b/libcloud/compute/drivers/ec2.py @@ -1554,21 +1554,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`` 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`` -- 1.8.2.3