1
diff --git a/hooks/coordinator-relation-changed b/hooks/coordinator-relation-changed
2
index fe39f65..9858c6b 100755
3
--- a/hooks/coordinator-relation-changed
4
+++ b/hooks/coordinator-relation-changed
5
@@ -1,18 +1,22 @@
6
1
#!/usr/bin/env python3
1
#!/usr/bin/env python3
7
2
2
9
3
# Load modules from $CHARM_DIR/lib
3
# Load modules from $JUJU_CHARM_DIR/lib
10
4
import sys
4
import sys
11
5
sys.path.append('lib')
5
sys.path.append('lib')
12
6
6
15
7
from charms.layer.basic import bootstrap_charm_deps
7
from charms.layer import basic  # noqa
16
8
bootstrap_charm_deps()
8
basic.bootstrap_charm_deps()
17
9
18
10
from charmhelpers.core import hookenv  # noqa
19
11
hookenv.atstart(basic.init_config_states)
20
12
hookenv.atexit(basic.clear_config_states)
21
9
13
22
10
14
23
11
# This will load and run the appropriate @hook and other decorated
15
# This will load and run the appropriate @hook and other decorated
26
12
# handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
16
# handlers from $JUJU_CHARM_DIR/reactive, $JUJU_CHARM_DIR/hooks/reactive,
27
13
# and $CHARM_DIR/hooks/relations.
17
# and $JUJU_CHARM_DIR/hooks/relations.
28
14
#
18
#
29
15
# See https://jujucharms.com/docs/stable/authors-charm-building
19
# See https://jujucharms.com/docs/stable/authors-charm-building
30
16
# for more information on this pattern.
20
# for more information on this pattern.
32
17
from charms.reactive import main
21
from charms.reactive import main  # noqa
33
18
main()
22
main()
34
diff --git a/hooks/coordinator-relation-departed b/hooks/coordinator-relation-departed
35
index fe39f65..9858c6b 100755
36
--- a/hooks/coordinator-relation-departed
37
+++ b/hooks/coordinator-relation-departed
38
@@ -1,18 +1,22 @@
39
1
#!/usr/bin/env python3
1
#!/usr/bin/env python3
40
2
2
42
3
# Load modules from $CHARM_DIR/lib
3
# Load modules from $JUJU_CHARM_DIR/lib
43
4
import sys
4
import sys
44
5
sys.path.append('lib')
5
sys.path.append('lib')
45
6
6
48
7
from charms.layer.basic import bootstrap_charm_deps
7
from charms.layer import basic  # noqa
49
8
bootstrap_charm_deps()
8
basic.bootstrap_charm_deps()
50
9
51
10
from charmhelpers.core import hookenv  # noqa
52
11
hookenv.atstart(basic.init_config_states)
53
12
hookenv.atexit(basic.clear_config_states)
54
9
13
55
10
14
56
11
# This will load and run the appropriate @hook and other decorated
15
# This will load and run the appropriate @hook and other decorated
59
12
# handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
16
# handlers from $JUJU_CHARM_DIR/reactive, $JUJU_CHARM_DIR/hooks/reactive,
60
13
# and $CHARM_DIR/hooks/relations.
17
# and $JUJU_CHARM_DIR/hooks/relations.
61
14
#
18
#
62
15
# See https://jujucharms.com/docs/stable/authors-charm-building
19
# See https://jujucharms.com/docs/stable/authors-charm-building
63
16
# for more information on this pattern.
20
# for more information on this pattern.
65
17
from charms.reactive import main
21
from charms.reactive import main  # noqa
66
18
main()
22
main()
67
diff --git a/hooks/leader-elected b/hooks/leader-elected
68
index fe39f65..9858c6b 100755
69
--- a/hooks/leader-elected
70
+++ b/hooks/leader-elected
71
@@ -1,18 +1,22 @@
72
1
#!/usr/bin/env python3
1
#!/usr/bin/env python3
73
2
2
75
3
# Load modules from $CHARM_DIR/lib
3
# Load modules from $JUJU_CHARM_DIR/lib
76
4
import sys
4
import sys
77
5
sys.path.append('lib')
5
sys.path.append('lib')
78
6
6
81
7
from charms.layer.basic import bootstrap_charm_deps
7
from charms.layer import basic  # noqa
82
8
bootstrap_charm_deps()
8
basic.bootstrap_charm_deps()
83
9
84
10
from charmhelpers.core import hookenv  # noqa
85
11
hookenv.atstart(basic.init_config_states)
86
12
hookenv.atexit(basic.clear_config_states)
87
9
13
88
10
14
89
11
# This will load and run the appropriate @hook and other decorated
15
# This will load and run the appropriate @hook and other decorated
92
12
# handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
16
# handlers from $JUJU_CHARM_DIR/reactive, $JUJU_CHARM_DIR/hooks/reactive,
93
13
# and $CHARM_DIR/hooks/relations.
17
# and $JUJU_CHARM_DIR/hooks/relations.
94
14
#
18
#
95
15
# See https://jujucharms.com/docs/stable/authors-charm-building
19
# See https://jujucharms.com/docs/stable/authors-charm-building
96
16
# for more information on this pattern.
20
# for more information on this pattern.
98
17
from charms.reactive import main
21
from charms.reactive import main  # noqa
99
18
main()
22
main()
100
diff --git a/hooks/leader-settings-changed b/hooks/leader-settings-changed
101
index fe39f65..9858c6b 100755
102
--- a/hooks/leader-settings-changed
103
+++ b/hooks/leader-settings-changed
104
@@ -1,18 +1,22 @@
105
1
#!/usr/bin/env python3
1
#!/usr/bin/env python3
106
2
2
108
3
# Load modules from $CHARM_DIR/lib
3
# Load modules from $JUJU_CHARM_DIR/lib
109
4
import sys
4
import sys
110
5
sys.path.append('lib')
5
sys.path.append('lib')
111
6
6
114
7
from charms.layer.basic import bootstrap_charm_deps
7
from charms.layer import basic  # noqa
115
8
bootstrap_charm_deps()
8
basic.bootstrap_charm_deps()
116
9
117
10
from charmhelpers.core import hookenv  # noqa
118
11
hookenv.atstart(basic.init_config_states)
119
12
hookenv.atexit(basic.clear_config_states)
120
9
13
121
10
14
122
11
# This will load and run the appropriate @hook and other decorated
15
# This will load and run the appropriate @hook and other decorated
125
12
# handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
16
# handlers from $JUJU_CHARM_DIR/reactive, $JUJU_CHARM_DIR/hooks/reactive,
126
13
# and $CHARM_DIR/hooks/relations.
17
# and $JUJU_CHARM_DIR/hooks/relations.
127
14
#
18
#
128
15
# See https://jujucharms.com/docs/stable/authors-charm-building
19
# See https://jujucharms.com/docs/stable/authors-charm-building
129
16
# for more information on this pattern.
20
# for more information on this pattern.
131
17
from charms.reactive import main
21
from charms.reactive import main  # noqa
132
18
main()
22
main()
Status:	Needs review
Proposed branch:	~cjwatson/layer-coordinator:config-flags
Merge into:	layer-coordinator:master
Diff against target:	132 lines (+40/-24) 4 files modified hooks/coordinator-relation-changed (+10/-6) hooks/coordinator-relation-departed (+10/-6) hooks/leader-elected (+10/-6) hooks/leader-settings-changed (+10/-6)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Stuart Bishop		2023-04-18	Pending
Review via email: mp+441314@code.launchpad.net