X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=n2vc%2Fprovisioner.py;h=fbb16cabd63f5f996280c6fe286a8cc04f08fe13;hp=a2fe13ef496f26ea863ce5d3031249f020692dad;hb=891732a9f4f1381a49e506cb9d39132b328aaa1c;hpb=e370f3b118f2fa4ce4e5a7fdecdf40c999d0e6be diff --git a/n2vc/provisioner.py b/n2vc/provisioner.py index a2fe13e..fbb16ca 100644 --- a/n2vc/provisioner.py +++ b/n2vc/provisioner.py @@ -72,8 +72,8 @@ fi 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 """ @@ -243,8 +243,8 @@ class AsyncSSHProvisioner: 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"]), @@ -586,8 +586,8 @@ class SSHProvisioner: 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"]),