summaryrefslogtreecommitdiff
path: root/cloudinit
diff options
context:
space:
mode:
authorMatthew Thode <mthode@mthode.org>2016-08-18 16:27:27 -0500
committerScott Moser <smoser@brickies.net>2016-08-23 14:25:09 -0400
commit3f1373a9785de5c5843c060835e444046ab50756 (patch)
tree4ec487f99dc1d1c2ec6644cb04a331bfcaaa5d5e /cloudinit
parent6a8aa46863f1a4a5f3c0d37d34fd02d57790be01 (diff)
downloadvyos-cloud-init-3f1373a9785de5c5843c060835e444046ab50756.tar.gz
vyos-cloud-init-3f1373a9785de5c5843c060835e444046ab50756.zip
add install option for openrc
Adds an install option for for OpenRC init scripts. I've also restricted installing tests more correctly. Also, don't hardcode the path to ip (/bin/ip on gentoo).
Diffstat (limited to 'cloudinit')
-rw-r--r--cloudinit/sources/DataSourceOpenNebula.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/sources/DataSourceOpenNebula.py b/cloudinit/sources/DataSourceOpenNebula.py
index 7b3a76b9..635a836c 100644
--- a/cloudinit/sources/DataSourceOpenNebula.py
+++ b/cloudinit/sources/DataSourceOpenNebula.py
@@ -407,7 +407,7 @@ def read_context_disk_dir(source_dir, asuser=None):
# http://opennebula.org/documentation:rel3.8:cong#network_configuration
for k in context:
if re.match(r'^ETH\d+_IP$', k):
- (out, _) = util.subp(['/sbin/ip', 'link'])
+ (out, _) = util.subp(['ip', 'link'])
net = OpenNebulaNetwork(out, context)
results['network-interfaces'] = net.gen_conf()
break