summaryrefslogtreecommitdiff
path: root/cloudinit/sources/helpers/vmware
diff options
context:
space:
mode:
authorSankar Tanguturi <stanguturi@stanguturi-rhel>2016-03-11 11:29:15 -0800
committerSankar Tanguturi <stanguturi@stanguturi-rhel>2016-03-11 11:29:15 -0800
commita3fd7441f8ea4d25e96b9bc0eca7cbb6164a4691 (patch)
tree74a6ebbe7c91c30467577eb231fab8c5f188b93c /cloudinit/sources/helpers/vmware
parenta6e0922a4d34ede6df000dd8fc4bb3531218d69f (diff)
parent41470d29f5888baf7ec78e170cc0d6d981dcf63e (diff)
downloadvyos-cloud-init-a3fd7441f8ea4d25e96b9bc0eca7cbb6164a4691.tar.gz
vyos-cloud-init-a3fd7441f8ea4d25e96b9bc0eca7cbb6164a4691.zip
- Executed 'bzr merge' and resolved all the conflicts.
- Now my branch is identical to trunk.dist
Diffstat (limited to 'cloudinit/sources/helpers/vmware')
-rw-r--r--cloudinit/sources/helpers/vmware/imc/config_nic.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/cloudinit/sources/helpers/vmware/imc/config_nic.py b/cloudinit/sources/helpers/vmware/imc/config_nic.py
index 42fbcc7e..77098a05 100644
--- a/cloudinit/sources/helpers/vmware/imc/config_nic.py
+++ b/cloudinit/sources/helpers/vmware/imc/config_nic.py
@@ -19,7 +19,6 @@
import logging
import os
-import subprocess
import re
from cloudinit import util
@@ -186,9 +185,8 @@ class NicConfigurator:
lines = []
for addr in addrs:
- lines.append(
- ' up route -A inet6 add default gw %s metric 10000' %
- addr.gateway)
+ lines.append(' up route -A inet6 add default gw '
+ '%s metric 10000' % addr.gateway)
return lines