projects
/
osm
/
N2VC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add unit tests to N2VC refactor
[osm/N2VC.git]
/
n2vc
/
provisioner.py
diff --git
a/n2vc/provisioner.py
b/n2vc/provisioner.py
index
a2fe13e
..
fbb16ca
100644
(file)
--- a/
n2vc/provisioner.py
+++ b/
n2vc/provisioner.py
@@
-72,8
+72,8
@@
fi
IPTABLES_SCRIPT = """#!/bin/bash
set -e
IPTABLES_SCRIPT = """#!/bin/bash
set -e
-apt-get update
-DEBIAN_FRONTEND=noninteractive apt-get install -yqq iptables-persistent
+[ -v `which netfilter-persistent` ] && apt update \
+
&&
DEBIAN_FRONTEND=noninteractive apt-get install -yqq iptables-persistent
iptables -t nat -A OUTPUT -p tcp -d {} -j DNAT --to-destination {}
netfilter-persistent save
"""
iptables -t nat -A OUTPUT -p tcp -d {} -j DNAT --to-destination {}
netfilter-persistent save
"""
@@
-243,8
+243,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()),
# a nop for Juju w/manual machines
- )
+ self.host, str(uuid.uuid4()),
+ )
# a nop for Juju w/manual machines
params.hardware_characteristics = {
"arch": hw["arch"],
"mem": int(hw["mem"]),
params.hardware_characteristics = {
"arch": hw["arch"],
"mem": int(hw["mem"]),
@@
-586,8
+586,8
@@
class SSHProvisioner:
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()),
# a nop for Juju w/manual machines
- )
+ self.host, str(uuid.uuid4()),
+ )
# a nop for Juju w/manual machines
params.hardware_characteristics = {
"arch": hw["arch"],
"mem": int(hw["mem"]),
params.hardware_characteristics = {
"arch": hw["arch"],
"mem": int(hw["mem"]),