~ballot/apache2-charm:lp1863860

Branch merges

Propose for merging

Merged into apache2-charm:master at revision 316a6124af02daf8f5ae7df29f38136495975682

Junien F: Approve on 2020-02-19

Canonical IS Reviewers: Pending requested 2020-02-19

Diff: 85 lines (+13/-7)

3 files modified

.gitignore (+2/-0)
hooks/hooks.py (+6/-5)
hooks/tests/test_balancer_hook.py (+5/-2)

api

Merged into apache2-charm:master at revision e4a6d41f626a45e77bfdd8934e7de2618a802bfa

Tom Haddon: Approve on 2020-02-19

Canonical IS Reviewers: Pending requested 2020-02-19

Diff: 28 lines (+6/-2)

2 files modified

config.yaml (+4/-1)
hooks/hooks.py (+2/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

03e4413... by Benjamin Allot on 2020-02-19

Fix tests with recent modifications

880d09b... by Benjamin Allot on 2020-02-19

Fix bad call to re.split and add the same logic for purge

989f360... by Benjamin Allot on 2020-02-19

Add gitignore file

e4a6d41... by Benjamin Allot on 2020-02-19

Fix extra_packages config when used with several packages

Reviewed-on: https://code.launchpad.net/~ballot/apache2-charm/+git/apache2-charm/+merge/379451
Reviewed-by: Tom Haddon <email address hidden>

a97cf60... by Benjamin Allot on 2020-02-19

Fix extra_packages config when used with several packages

The parameter can now accept either a space or a comma separated string
with several packages

a562217... by Paul Collins on 2019-10-22

revert to python2.7

Reviewed-on: https://code.launchpad.net/~pjdc/apache2-charm/+git/apache2-charm/+merge/374493
Reviewed-by: Haw Loeung <email address hidden>

81457a2... by Paul Collins on 2019-10-22

revert to python2.7

The bundled charm-helpers doesn't support Python 3, but even
when it's updated it reveals that the core code needs work too,
e.g. ensure_package_status:

  File "/var/lib/juju/agents/unit-apache2-0/charm/hooks/upgrade-charm", line 70, in ensure_package_status
    dpkg.communicate(input=selections)
  File "/usr/lib/python3.6/subprocess.py", line 848, in communicate
    self._stdin_write(input)
  File "/usr/lib/python3.6/subprocess.py", line 801, in _stdin_write
    self.stdin.write(input)
TypeError: a bytes-like object is required, not 'str'

289578c... by Paul Collins on 2019-10-21

document configuration values

Reviewed-on: https://code.launchpad.net/~pjdc/apache2-charm/+git/apache2-charm/+merge/374412
Reviewed-by: Joel Sing <email address hidden>

8330d2f... by Paul Collins on 2019-10-21

fix indentation, and address revew comments

15c65d2... by Paul Collins on 2019-10-21

document configuration values