cloud-init

Merge ~prometheanfire/cloud-init:add-openrc-init-option into cloud-init:master

  1. Git
  2. lp:~prometheanfire/cloud-init
  3. add-openrc-init-option
  4. Merge into master
Proposed by Matthew Thode on 2016-08-18
Status: Merged
Merged at revision: 3f1373a9785de5c5843c060835e444046ab50756
Proposed branch: ~prometheanfire/cloud-init:add-openrc-init-option
Merge into: cloud-init:master
Diff against target: 33 lines (+3/-1)
2 files modified
cloudinit/sources/DataSourceOpenNebula.py (+1/-1)
setup.py (+2/-0)
Reviewer Review Type Date Requested Status
cloud-init commiters 2016-08-18 Pending
Review via email: mp+303339@code.launchpad.net

Description of the Change

Some cleanup that makes installing and working on Gentoo a bit better.

To post a comment you must log in.
Scott Moser (smoser) wrote :

one question in line.

Matthew Thode (prometheanfire) wrote :

fixed

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/cloudinit/sources/DataSourceOpenNebula.py b/cloudinit/sources/DataSourceOpenNebula.py
2index 7b3a76b..635a836 100644
3--- a/cloudinit/sources/DataSourceOpenNebula.py
4+++ b/cloudinit/sources/DataSourceOpenNebula.py
5@@ -407,7 +407,7 @@ def read_context_disk_dir(source_dir, asuser=None):
6 # http://opennebula.org/documentation:rel3.8:cong#network_configuration
7 for k in context:
8 if re.match(r'^ETH\d+_IP$', k):
9- (out, _) = util.subp(['/sbin/ip', 'link'])
10+ (out, _) = util.subp(['ip', 'link'])
11 net = OpenNebulaNetwork(out, context)
12 results['network-interfaces'] = net.gen_conf()
13 break
14diff --git a/setup.py b/setup.py
15index bbadd7b..8ff667d 100755
16--- a/setup.py
17+++ b/setup.py
18@@ -74,6 +74,7 @@ INITSYS_FILES = {
19 'sysvinit': [f for f in glob('sysvinit/redhat/*') if is_f(f)],
20 'sysvinit_freebsd': [f for f in glob('sysvinit/freebsd/*') if is_f(f)],
21 'sysvinit_deb': [f for f in glob('sysvinit/debian/*') if is_f(f)],
22+ 'sysvinit_openrc': [f for f in glob('sysvinit/gentoo/*') if is_f(f)],
23 'systemd': [f for f in (glob('systemd/*.service') +
24 glob('systemd/*.target')) if is_f(f)],
25 'systemd.generators': [f for f in glob('systemd/*-generator') if is_f(f)],
26@@ -83,6 +84,7 @@ INITSYS_ROOTS = {
27 'sysvinit': '/etc/rc.d/init.d',
28 'sysvinit_freebsd': '/usr/local/etc/rc.d',
29 'sysvinit_deb': '/etc/init.d',
30+ 'sysvinit_openrc': '/etc/init.d',
31 'systemd': pkg_config_read('systemd', 'systemdsystemunitdir'),
32 'systemd.generators': pkg_config_read('systemd',
33 'systemdsystemgeneratordir'),

Subscribers

People subscribed via source and target branches