projects
/
osm
/
N2VC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add ENV default for bug 585
[osm/N2VC.git]
/
n2vc
/
vnf.py
diff --git
a/n2vc/vnf.py
b/n2vc/vnf.py
index
38a9d15
..
9f8360b
100644
(file)
--- a/
n2vc/vnf.py
+++ b/
n2vc/vnf.py
@@
-246,9
+246,15
@@
class N2VC:
is bootstrapped to. This method will write the public key to disk in
that location: ~/.local/share/juju/ssh/juju_id_rsa.pub
"""
is bootstrapped to. This method will write the public key to disk in
that location: ~/.local/share/juju/ssh/juju_id_rsa.pub
"""
+ # Make sure that we have a public key before writing to disk
if public_key is None or len(public_key) == 0:
if public_key is None or len(public_key) == 0:
- return
-
+ if 'OSM_VCA_PUBKEY' in os.environ:
+ public_key = os.getenv('OSM_VCA_PUBKEY', '')
+ if len(public_key == 0):
+ return
+ else:
+ return
+
path = "{}/.local/share/juju/ssh".format(
os.path.expanduser('~'),
)
path = "{}/.local/share/juju/ssh".format(
os.path.expanduser('~'),
)