projects
/
osm
/
N2VC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reformat N2VC to standardized format
[osm/N2VC.git]
/
n2vc
/
provisioner.py
diff --git
a/n2vc/provisioner.py
b/n2vc/provisioner.py
index
91d5c04
..
e2b51b9
100644
(file)
--- a/
n2vc/provisioner.py
+++ b/
n2vc/provisioner.py
@@
-250,7
+250,8
@@
class AsyncSSHProvisioner:
params.series = hw["series"]
params.instance_id = "manual:{}".format(self.host)
params.nonce = "manual:{}:{}".format(
params.series = hw["series"]
params.instance_id = "manual:{}".format(self.host)
params.nonce = "manual:{}:{}".format(
- self.host, str(uuid.uuid4()),
+ self.host,
+ str(uuid.uuid4()),
) # a nop for Juju w/manual machines
params.hardware_characteristics = {
"arch": hw["arch"],
) # a nop for Juju w/manual machines
params.hardware_characteristics = {
"arch": hw["arch"],
@@
-261,7
+262,9
@@
class AsyncSSHProvisioner:
return params
return params
- async def install_agent(self, connection, nonce, machine_id, proxy=None, series=None):
+ async def install_agent(
+ self, connection, nonce, machine_id, proxy=None, series=None
+ ):
"""
:param object connection: Connection to Juju API
:param str nonce: The nonce machine specification
"""
:param object connection: Connection to Juju API
:param str nonce: The nonce machine specification
@@
-297,7
+300,9
@@
class AsyncSSHProvisioner:
- '[::1]:17070'
"""
if proxy:
- '[::1]:17070'
"""
if proxy:
- m = re.search(r"apiaddresses:\n- (\d+\.\d+\.\d+\.\d+):17070", results.script)
+ m = re.search(
+ r"apiaddresses:\n- (\d+\.\d+\.\d+\.\d+):17070", results.script
+ )
apiaddress = m.group(1)
"""Add IP Table rule
apiaddress = m.group(1)
"""Add IP Table rule
@@
-326,8
+331,10
@@
class AsyncSSHProvisioner:
stdout, stderr = await self._run_configure_script(script)
break
except Exception as e:
stdout, stderr = await self._run_configure_script(script)
break
except Exception as e:
- self.log.debug("Waiting for DNAT rules to be applied and saved, "
- "sleeping {} seconds".format(delay))
+ self.log.debug(
+ "Waiting for DNAT rules to be applied and saved, "
+ "sleeping {} seconds".format(delay)
+ )
if attempts > retry:
raise e
else:
if attempts > retry:
raise e
else: