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:
1ed6884
)
disable file injection for now
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Thu, 17 Apr 2014 00:15:55 +0000
(20:15 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Thu, 17 Apr 2014 00:15:55 +0000
(20:15 -0400)
planetstack/openstack/driver.py
patch
|
blob
|
history
diff --git
a/planetstack/openstack/driver.py
b/planetstack/openstack/driver.py
index
4130d00
..
f5abb02
100644
(file)
--- a/
planetstack/openstack/driver.py
+++ b/
planetstack/openstack/driver.py
@@
-418,8
+418,8
@@
class OpenStackDriver:
security_group = self.config.nova_default_security_group
files = {}
- if pubkeys:
- files["/root/.ssh/authorized_keys"] = "\n".join(pubkeys).encode('base64')
+
#
if pubkeys:
+
#
files["/root/.ssh/authorized_keys"] = "\n".join(pubkeys).encode('base64')
hints = {}
availability_zone = None
if hostname:
@@
-430,7
+430,7
@@
class OpenStackDriver:
flavor=flavor.id,
image=image_id,
security_group = security_group,
- files = files,
+
#
files = files,
scheduler_hints=hints,
availability_zone=availability_zone,
nics=nics,