Merge lp://qastaging/~danilo/landscape-charm/fix-package-search into lp://qastaging/~landscape/landscape-charm/trunk
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Данило Шеган | ||||
| Approved revision: | 278 | ||||
| Merged at revision: | 279 | ||||
| Proposed branch: | lp://qastaging/~danilo/landscape-charm/fix-package-search | ||||
| Merge into: | lp://qastaging/~landscape/landscape-charm/trunk | ||||
| Diff against target: |
85 lines (+19/-19) 2 files modified
lib/tests/test_templates.py (+3/-3) templates/service.conf (+16/-16) |
||||
| To merge this branch: | bzr merge lp://qastaging/~danilo/landscape-charm/fix-package-search | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Alberto Donato (community) | Approve | ||
| Free Ekanayaka (community) | Approve | ||
| 🤖 Landscape Builder | test results | Approve | |
|
Review via email:
|
|||
Commit message
Fix package-search configuration in service.conf
This fixes [package-search] section in service.conf to match what we usually do for LDS (though our old charm used port 9090: I don't think it matters much which we choose, as long as they are in the 9090-9099 range so as not to overlap with our other services).
This branch also fixes the whitespacing issue (to some extent) by using {%- or -%} which truncates the space to the left and to the right (note the minus sign).
Description of the change
Fix package-search configuration in service.conf
This fixes [package-search] section in service.conf to match what we usually do for LDS (though our old charm used port 9090: I don't think it matters much which we choose, as long as they are in the 9090-9099 range so as not to overlap with our other services).
This branch also fixes the whitespacing issue (to some extent) by using {%- or -%} which truncates the space to the left and to the right (note the minus sign).
| 🤖 Landscape Builder (landscape-builder) wrote | # |
| 🤖 Landscape Builder (landscape-builder) wrote | # |
Command: make ci-test
Result: Success
Revno: 278
Branch: lp:~danilo/landscape-charm/fix-package-search
Jenkins: https:/