git://git.onelab.eu
/
plstackapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3a50a6c
)
switch back to files argument
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Wed, 16 Apr 2014 11:49:41 +0000
(07:49 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Wed, 16 Apr 2014 11:49:51 +0000
(07:49 -0400)
planetstack/openstack/driver.py
patch
|
blob
|
history
diff --git
a/planetstack/openstack/driver.py
b/planetstack/openstack/driver.py
index
b8faf25
..
4130d00
100644
(file)
--- a/
planetstack/openstack/driver.py
+++ b/
planetstack/openstack/driver.py
@@
-417,12
+417,9
@@
class OpenStackDriver:
if not security_group:
security_group = self.config.nova_default_security_group
if not security_group:
security_group = self.config.nova_default_security_group
- personality = []
+ files = {}
if pubkeys:
if pubkeys:
- personality.append({
- 'path': '/root/.ssh/authorized_keys',
- 'contents':"\n".join(pubkeys),
- })
+ files["/root/.ssh/authorized_keys"] = "\n".join(pubkeys).encode('base64')
hints = {}
availability_zone = None
if hostname:
hints = {}
availability_zone = None
if hostname:
@@
-433,7
+430,7
@@
class OpenStackDriver:
flavor=flavor.id,
image=image_id,
security_group = security_group,
flavor=flavor.id,
image=image_id,
security_group = security_group,
-
personality = personality
,
+
files = files
,
scheduler_hints=hints,
availability_zone=availability_zone,
nics=nics,
scheduler_hints=hints,
availability_zone=availability_zone,
nics=nics,