Landscape Charm

Merge lp://qastaging/~danilo/landscape-charm/pppa-proxy into lp://qastaging/~landscape/landscape-charm/trunk

  1. pppa-proxy
  2. Merge into trunk
Proposed by Данило Шеган
Status: Merged
Approved by: Данило Шеган
Approved revision: 378
Merged at revision: 366
Proposed branch: lp://qastaging/~danilo/landscape-charm/pppa-proxy
Merge into: lp://qastaging/~landscape/landscape-charm/trunk
Diff against target: 316 lines (+206/-6)
6 files modified
lib/relations/hosted.py (+49/-2)
lib/relations/tests/test_hosted.py (+84/-4)
lib/tests/test_services.py (+2/-0)
lib/tests/test_templates.py (+55/-0)
templates/landscape-server (+4/-0)
templates/service.conf (+12/-0)
To merge this branch: bzr merge lp://qastaging/~danilo/landscape-charm/pppa-proxy
Reviewer Review Type Date Requested Status
🤖 Landscape Builder test results Approve
Adam Collard (community) Approve
Free Ekanayaka (community) Approve
Review via email: mp+305479@code.qastaging.launchpad.net

Commit message

Make use of the pppa-proxy configuration provided by landscape-hosted charm and configure pppa-proxy in service.conf.

Description of the change

Make use of the pppa-proxy configuration provided by landscape-hosted charm and configure pppa-proxy in service.conf.

Testing instructions:

1. Deploy Landscape with the bundle from https://pastebin.canonical.com/165278/ with
     juju-deployer -vdW -w90 -c landscape-pppa-proxy.yaml landscape-pppa-proxy
   (however, you'll also need landscape package built from r10518, not sure lds-trunk has that yet since it only landed today).

2. Make sure that RUN_PPPA_PROXY is set in /etc/defaults/landscape-server and there is a proper pppa-proxy section in /etc/landscape/service.conf

(If you are missing the latest landscape-hosted package, you won't get the actual pppa-proxy init script and the service won't be started)

To post a comment you must log in.
Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Fail
Revno: 372
Branch: lp:~danilo/landscape-charm/pppa-proxy
Jenkins: https://ci.lscape.net/job/latch-test/10201/

review: Needs Fixing (test results)
lp://qastaging/~danilo/landscape-charm/pppa-proxy updated
373. By Данило Шеган

Fix the broken test.

Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Fail
Revno: 373
Branch: lp:~danilo/landscape-charm/pppa-proxy
Jenkins: https://ci.lscape.net/job/latch-test/10203/

review: Needs Fixing (test results)
lp://qastaging/~danilo/landscape-charm/pppa-proxy updated
374. By Данило Шеган

Lint fix.

Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Success
Revno: 374
Branch: lp:~danilo/landscape-charm/pppa-proxy
Jenkins: https://ci.lscape.net/job/latch-test/10204/

review: Approve (test results)
Revision history for this message
Free Ekanayaka (free.ekanayaka) wrote :

First pass, marking as N/I to get some clarifications.

review: Needs Information
lp://qastaging/~danilo/landscape-charm/pppa-proxy updated
375. By Данило Шеган

Address review comments: report all missing releases when MissingSupportedReleaseUrlError is raised.

Revision history for this message
Данило Шеган (danilo) wrote :

I've addressed all the comments. I do not feel strongly about keeping the .strip()s, but I still kept them with the explanation why I went with them in the first place. Let me know what you think.

Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Success
Revno: 375
Branch: lp:~danilo/landscape-charm/pppa-proxy
Jenkins: https://ci.lscape.net/job/latch-test/10216/

review: Approve (test results)
Revision history for this message
Free Ekanayaka (free.ekanayaka) wrote :

+1 with a nit.

review: Approve
Revision history for this message
Adam Collard (adam-collard) wrote :

Bunch of nits, but looks good, +1

review: Approve
lp://qastaging/~danilo/landscape-charm/pppa-proxy updated
376. By Данило Шеган

Switch to .format() for string formatting.

Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Success
Revno: 376
Branch: lp:~danilo/landscape-charm/pppa-proxy
Jenkins: https://ci.lscape.net/job/latch-test/10247/

review: Approve (test results)
Revision history for this message
Данило Шеган (danilo) wrote :

Addressed all the comments, thanks for great feedback!

lp://qastaging/~danilo/landscape-charm/pppa-proxy updated
377. By Данило Шеган

Code clean-ups.

Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Success
Revno: 377
Branch: lp:~danilo/landscape-charm/pppa-proxy
Jenkins: https://ci.lscape.net/job/latch-test/10254/

review: Approve (test results)
lp://qastaging/~danilo/landscape-charm/pppa-proxy updated
378. By Данило Шеган

Revert symlink changes that happened when I attempted to sync charmhelpers previously.

Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Success
Revno: 378
Branch: lp:~danilo/landscape-charm/pppa-proxy
Jenkins: https://ci.lscape.net/job/latch-test/10260/

review: Approve (test results)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches