Merge lp:~fginther/charms/trusty/jenkaas/add-default-user into lp:~canonical-ci-engineering/charms/trusty/jenkaas/trunk
Proposed by
Francis Ginther
Status: | Merged |
---|---|
Approved by: | Para Siva |
Approved revision: | 6 |
Merged at revision: | 6 |
Proposed branch: | lp:~fginther/charms/trusty/jenkaas/add-default-user |
Merge into: | lp:~canonical-ci-engineering/charms/trusty/jenkaas/trunk |
Diff against target: |
174 lines (+87/-6) 5 files modified
config.yaml (+10/-0) files/templates/config.xml (+10/-0) files/templates/user/config.xml (+25/-0) hooks/actions.py (+38/-4) hooks/services.py (+4/-2) |
To merge this branch: | bzr merge lp:~fginther/charms/trusty/jenkaas/add-default-user |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Para Siva (community) | Approve | ||
Joe Talbott (community) | Approve | ||
Review via email: mp+262405@code.launchpad.net |
Commit message
Add support for default security and a default jenkins user.
Description of the change
Add support for default security and a default jenkins user.
This adds a jenkins config.xml and a user config.xml borrowed from the jenkins charm. This enables basic security and an initial user. I'd like to follow this MP up later and improve the template handling (which can probably be done better via render_template in services.py).
This also fixes the port defined for the jenkins service, which should be 8080.
To post a comment you must log in.
Looks good to me. It's funny I had just created a card for this. :)