projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'vio' into v2.0
[osm/RO.git]
/
osm_ro
/
vimconn_vmware.py
diff --git
a/osm_ro/vimconn_vmware.py
b/osm_ro/vimconn_vmware.py
index
701008f
..
9faf8b4
100644
(file)
--- a/
osm_ro/vimconn_vmware.py
+++ b/
osm_ro/vimconn_vmware.py
@@
-1373,7
+1373,7
@@
class vimconnector(vimconn.vimconnector):
return None
def new_vminstance(self, name=None, description="", start=False, image_id=None, flavor_id=None, net_list={},
return None
def new_vminstance(self, name=None, description="", start=False, image_id=None, flavor_id=None, net_list={},
- cloud_config=None, disk_list=None):
+ cloud_config=None, disk_list=None
, availability_zone_index=None, availability_zone_list=None
):
"""Adds a VM instance to VIM
Params:
start: indicates if VM must start or boot in pause mode. Ignored
"""Adds a VM instance to VIM
Params:
start: indicates if VM must start or boot in pause mode. Ignored
@@
-4024,7
+4024,8
@@
class vimconnector(vimconn.vimconnector):
'users': (optional) list of users to be inserted, each item is a dict with:
'name': (mandatory) user name,
'key-pairs': (optional) list of strings with the public key to be inserted to the user
'users': (optional) list of users to be inserted, each item is a dict with:
'name': (mandatory) user name,
'key-pairs': (optional) list of strings with the public key to be inserted to the user
- 'user-data': (optional) string is a text script to be passed directly to cloud-init
+ 'user-data': (optional) can be a string with the text script to be passed directly to cloud-init,
+ or a list of strings, each one contains a script to be passed, usually with a MIMEmultipart file
'config-files': (optional). List of files to be transferred. Each item is a dict with:
'dest': (mandatory) string with the destination absolute path
'encoding': (optional, by default text). Can be one of:
'config-files': (optional). List of files to be transferred. Each item is a dict with:
'dest': (mandatory) string with the destination absolute path
'encoding': (optional, by default text). Can be one of: