Merge lp://staging/~abentley/charms/precise/juju-reports/templates-and-ssh into lp://staging/~juju-qa/charms/precise/juju-reports/trunk
Status: | Merged |
---|---|
Merged at revision: | 32 |
Proposed branch: | lp://staging/~abentley/charms/precise/juju-reports/templates-and-ssh |
Merge into: | lp://staging/~juju-qa/charms/precise/juju-reports/trunk |
Diff against target: |
201 lines (+62/-72) 3 files modified
hooks/common.py (+54/-72) hooks/install (+5/-0) hooks/start (+3/-0) |
To merge this branch: | bzr merge lp://staging/~abentley/charms/precise/juju-reports/templates-and-ssh |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Curtis Hovey (community) | code | Approve | |
Review via email: mp+222333@code.staging.launchpad.net |
Commit message
Allow ini to be based on templates, allow ubuntu to use ssh.
Description of the change
This branch allows ubuntu to use ssh as lp-qa-bot, and to use templates from resources/ to create ini files.
Allowing SSH requires
- proper SSH configuration. Since bzr does not allow SSH options to be supplied at the commandline, I have written the same config to ~ubuntu/.ssh as ~root/.ssh.
- The SSH key. I extracted open_secret from update_source, and tweaked it to allow chmodding.
I also extracted configure_lp from update_source, because one does not depend on the other.
Using templates is basically simple. We open resources/
In current jujureports trees, resources/
In future jujureports trees, production.ini will not exist, it will be renamed to reports/
Existing deploys are locally-modified-- production.ini has different contents and development.ini and test.ini are deleted. This branch undoes these modification by reverting all files in resources/
I optimized deploy speed by allowing update_source to run before the database settings are determined. This led to a refactoring of the config-checking code, where every step that can be run is run. So get_config and IncompleteConfig are no longer needed.
As a driveby, I eliminated in_juju_reports.
Thank you