1
=== modified file 'hooks/hooks.py'
2
--- hooks/hooks.py	2019-08-22 13:09:17 +0000
3
+++ hooks/hooks.py	2021-05-13 02:21:01 +0000
4
@@ -47,12 +47,31 @@
5
47
                apt_update()
47
                apt_update()
6
48
            apt_install(conf.packageName(), options=['--force-yes'])
48
            apt_install(conf.packageName(), options=['--force-yes'])
7
49
49
8
50
def lsb_release():
9
51
    """Return /etc/lsb-release in a dict"""
10
52
    d = {}
11
53
    with open('/etc/lsb-release', 'r') as lsb:
12
54
        for l in lsb:
13
55
            k, v = l.split('=')
14
56
            d[k.strip()] = v.strip()
15
57
    return d
16
58
17
59
18
60
def get_distrib_codename():
19
61
    """Return the codename of the distribution
20
62
    :returns: The codename
21
63
    :rtype: str
22
64
    """
23
65
    return lsb_release()['DISTRIB_CODENAME'].lower()
24
66
25
50
67
26
51
def replaceInitScript():
68
def replaceInitScript():
27
52
    src = os.path.join(charm_dir(), "files", "init.sh")
69
    src = os.path.join(charm_dir(), "files", "init.sh")
28
53
    dest = "/etc/init.d/logstash-forwarder"
70
    dest = "/etc/init.d/logstash-forwarder"
29
54
    shutil.copyfile(src, dest)
71
    shutil.copyfile(src, dest)
30
55
    os.chmod(dest, 0755)
72
    os.chmod(dest, 0755)
31
73
    if get_distrib_codename() == 'bionic':
32
74
        subprocess.call(['systemctl', 'daemon-reload'])
33
56
75
34
57
76
35
58
def writeEtcDefault():
77
def writeEtcDefault():
36
59
78
37
=== modified file 'metadata.yaml'
38
--- metadata.yaml	2017-03-06 12:49:07 +0000
39
+++ metadata.yaml	2021-05-13 02:21:01 +0000
40
@@ -10,6 +10,7 @@
41
10
series:
10
series:
42
11
    - trusty
11
    - trusty
43
12
    - xenial
12
    - xenial
44
13
    - bionic
45
13
provides:
14
provides:
46
14
  nrpe-external-master:
15
  nrpe-external-master:
47
15
    interface: nrpe-external-master
16
    interface: nrpe-external-master
Status:	Merged
Approved by:	Haw Loeung on 2021-05-13
Approved revision:	25
Merged at revision:	25
Proposed branch:	lp:~woutervb/charms/trusty/logstash-forwarder/bionic-support
Merge into:	lp:~canonical-is-sa/charms/trusty/logstash-forwarder/trunk
Diff against target:	47 lines (+20/-0) 2 files modified hooks/hooks.py (+19/-0) metadata.yaml (+1/-0)
To merge this branch:	bzr merge lp:~woutervb/charms/trusty/logstash-forwarder/bionic-support
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Haw Loeung	+1	2021-05-13	Approve on 2021-05-13
Review via email: mp+402683@code.launchpad.net
1	=== modified file 'hooks/hooks.py'
2	--- hooks/hooks.py 2019-08-22 13:09:17 +0000
3	+++ hooks/hooks.py 2021-05-13 02:21:01 +0000
4	@@ -47,12 +47,31 @@
5	47	apt_update()	47	apt_update()
6	48	apt_install(conf.packageName(), options=['--force-yes'])	48	apt_install(conf.packageName(), options=['--force-yes'])
7	49		49
8			50	def lsb_release():
9			51	"""Return /etc/lsb-release in a dict"""
10			52	d = {}
11			53	with open('/etc/lsb-release', 'r') as lsb:
12			54	for l in lsb:
13			55	k, v = l.split('=')
14			56	d[k.strip()] = v.strip()
15			57	return d
16			58
17			59
18			60	def get_distrib_codename():
19			61	"""Return the codename of the distribution
20			62	:returns: The codename
21			63	:rtype: str
22			64	"""
23			65	return lsb_release()['DISTRIB_CODENAME'].lower()
24			66
25	50		67
26	51	def replaceInitScript():	68	def replaceInitScript():
27	52	src = os.path.join(charm_dir(), "files", "init.sh")	69	src = os.path.join(charm_dir(), "files", "init.sh")
28	53	dest = "/etc/init.d/logstash-forwarder"	70	dest = "/etc/init.d/logstash-forwarder"
29	54	shutil.copyfile(src, dest)	71	shutil.copyfile(src, dest)
30	55	os.chmod(dest, 0755)	72	os.chmod(dest, 0755)
31			73	if get_distrib_codename() == 'bionic':
32			74	subprocess.call(['systemctl', 'daemon-reload'])
33	56		75
34	57		76
35	58	def writeEtcDefault():	77	def writeEtcDefault():
36	59		78
37	=== modified file 'metadata.yaml'
38	--- metadata.yaml 2017-03-06 12:49:07 +0000
39	+++ metadata.yaml 2021-05-13 02:21:01 +0000
40	@@ -10,6 +10,7 @@
41	10	series:	10	series:
42	11	- trusty	11	- trusty
43	12	- xenial	12	- xenial
44			13	- bionic
45	13	provides:	14	provides:
46	14	nrpe-external-master:	15	nrpe-external-master:
47	15	interface: nrpe-external-master	16	interface: nrpe-external-master