projects
/
osm
/
N2VC.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
ce31bc3
c92163f
)
Merge "Complete Feature 6297"
author
Adam Israel
<adam.israel@canonical.com>
Mon, 27 May 2019 13:28:13 +0000
(15:28 +0200)
committer
Gerrit Code Review
<root@osm.etsi.org>
Mon, 27 May 2019 13:28:13 +0000
(15:28 +0200)
1
2
n2vc/vnf.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --combined
n2vc/vnf.py
index
04ad301
,
0d9530e
..
11ce3c8
---
1
/
n2vc/vnf.py
---
2
/
n2vc/vnf.py
+++ b/
n2vc/vnf.py
@@@
-339,6
-339,7
+339,7
@@@
class N2VC
# Loop through relations
for cfg in configs:
if 'juju' in cfg:
+ juju = cfg['juju']
if 'relation' in juju:
for rel in juju['relation']:
try:
@@@
-456,8
-457,8
+457,8
@@@
if all(k in machine_spec for k in ['host', 'user']):
# Enlist an existing machine as a Juju unit
machine = await model.add_machine(spec='ssh:{}@{}:{}'.format(
- machine_spec['user'],
- machine_spec['host'],
+ machine_spec['user
name
'],
+ machine_spec['host
name
'],
self.GetPrivateKeyPath(),
))
to = machine.id