Launchpad Mojo Specs

Merge ~pelpsi/launchpad-mojo-specs:launchpad-buildd-manager-fetch-service-configuration into launchpad-mojo-specs:master

  1. Git
  2. lp:~pelpsi/launchpad-mojo-specs
  3. launchpad-buildd-manager-fetch-service-configuration
  4. Merge into master
Proposed by Simone Pelosi
Status: Merged
Merged at revision: 4f49bb3bc44b5fab22922b335614e23789bb80bf
Proposed branch: ~pelpsi/launchpad-mojo-specs:launchpad-buildd-manager-fetch-service-configuration
Merge into: launchpad-mojo-specs:master
Diff against target: 56 lines (+16/-1)
1 file modified
lp/bundle.yaml (+16/-1)
Reviewer Review Type Date Requested Status
Ines Almeida Approve
Review via email: mp+465265@code.launchpad.net

Commit message

lp: add launchpad-buildd-manager configuration for fetch-service

To post a comment you must log in.
Revision history for this message
Ines Almeida (ines-almeida) wrote :

Looks good! I think we should set the production values before merging though, thoughts?

Revision history for this message
Simone Pelosi (pelpsi) wrote (last edit ):

> Looks good! I think we should set the production values before merging though,
> thoughts?

Atm we don't have the url for the fetch-service prod instance, it will be something like fetch-service.lp.internal. I think we can already set it since we have the flag that is controlling the fetch service feature.

Revision history for this message
Simone Pelosi (pelpsi) :
Revision history for this message
Ines Almeida (ines-almeida) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lp/bundle.yaml b/lp/bundle.yaml
2index 9dc0075..8e8a75c 100644
3--- a/lp/bundle.yaml
4+++ b/lp/bundle.yaml
5@@ -50,6 +50,9 @@
6 {%- set enable_launchpad_scripts_bzrsyncd = False %}
7 {%- set enable_librarian_frontend = False %}
8 {%- set enable_loggerhead = False %}
9+{%- set fetch_service_control_endpoint = "" %}
10+{%- set fetch_service_host = "" %}
11+{%- set fetch_service_port = 9988 %}
12 {#- If True, external-services/db_connections must be set in secrets. #}
13 {%- set external_database = False %}
14 {%- set gpg_upload_keys = False %}
15@@ -184,6 +187,9 @@
16 {%- set enable_librarian_frontend = True %}
17 {%- set enable_loggerhead = True %}
18 {%- set external_database = True %}
19+{%- set fetch_service_control_endpoint = "http://fetch-service.lp.internal:9999" %}
20+{%- set fetch_service_host = "fetch-service.lp.internal" %}
21+{%- set fetch_service_port = 9988 %}
22 {%- set gpg_upload_keys = True %}
23 {%- set haproxy_num_units = 2 %}
24 {%- set internal_branch_by_id_root = "http://bazaar.lp.internal:8081/" %}
25@@ -433,6 +439,9 @@
26 {%- set enable_librarian_frontend = True %}
27 {%- set enable_loggerhead = True %}
28 {%- set external_database = True %}
29+{%- set fetch_service_control_endpoint = "http://fetch-service.qastaging.lp.internal:9999" %}
30+{%- set fetch_service_host = "fetch-service.qastaging.lp.internal" %}
31+{%- set fetch_service_port = 9988 %}
32 {%- set haproxy_num_units = 2 %}
33 {%- set internal_branch_by_id_root = "http://bazaar.qastaging.lp.internal:8081/" %}
34 {%- set internal_bzr_api_endpoint = "http://bazaar-api.qastaging.lp.internal:10017/" %}
35@@ -973,7 +982,7 @@ applications:
36 launchpad-buildd-manager:
37 charm: ch:launchpad-buildd-manager
38 channel: stable
39- revision: 199
40+ revision: 323
41 constraints: "{{ launchpad_buildd_manager_constraints }}"
42 num_units: 1
43 options: {{ common_options("launchpad-buildd-manager") }}
44@@ -987,6 +996,12 @@ applications:
45 builder_proxy_auth_api_endpoint: "{{ builder_proxy_auth_api_endpoint }}"
46 builder_proxy_host: "{{ builder_proxy_host }}"
47 {%- endif %}
48+{%- if fetch_service_control_endpoint and fetch_service_host and fetch_service_port %}
49+ fetch_service_control_admin_username: "admin-{{ domain }}"
50+ fetch_service_control_endpoint: "{{ fetch_service_control_endpoint }}"
51+ fetch_service_host: "{{ fetch_service_host }}"
52+ fetch_service_port: "{{ fetch_service_port }}"
53+{%- endif %}
54 {%- if stage_name == "production" %}
55 cibuild_config: |
56 soss:

Subscribers

People subscribed via source and target branches