Merge lp:~simpoir/landscape-charm/bootstrap_with_key into lp:~landscape/landscape-charm/trunk
Proposed by
Simon Poirier
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Simon Poirier | ||||
Approved revision: | 399 | ||||
Merged at revision: | 398 | ||||
Proposed branch: | lp:~simpoir/landscape-charm/bootstrap_with_key | ||||
Merge into: | lp:~landscape/landscape-charm/trunk | ||||
Diff against target: |
296 lines (+96/-42) 8 files modified
actions.yaml (+3/-0) lib/apt.py (+1/-1) lib/bootstrap.py (+21/-15) lib/paths.py (+1/-0) lib/tests/test_apt.py (+10/-4) lib/tests/test_bootstrap.py (+46/-13) lib/tests/test_install.py (+2/-1) lib/tests/test_upgrade.py (+12/-8) |
||||
To merge this branch: | bzr merge lp:~simpoir/landscape-charm/bootstrap_with_key | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Adam Collard (community) | Approve | ||
🤖 Landscape Builder | test results | Approve | |
Review via email: mp+368020@code.launchpad.net |
Commit message
Use API to bootstrap to enable passing registration_key.
Description of the change
Use API to bootstrap to enable passing registration_key.
Testing instructions:
make bundles-local-charm
juju deploy bundles/
juju run-action --wait landscape-server/0 bootstrap <email address hidden> admin-password=
go to landscape and log with <email address hidden>/tedted and check the registration key is set on the account.
To post a comment you must log in.
Command: make ci-test /ci.lscape. net/job/ latch-test- xenial/ 3953/
Result: Fail
Revno: 398
Branch: lp:~simpoir/landscape-charm/bootstrap_with_key
Jenkins: https:/