Merge ~pelpsi/launchpad:launchpad-build-manager-fetch-service-support into launchpad:master

[Simone Pelosi]

Update launchpad-buildd-manager to support Fetch Service

Add configs for fetch service into launchpad-buildd-manager charm.

[Ines Almeida (ines-almeida)]

review: Approve

diff --git a/charm/launchpad-buildd-manager/config.yaml b/charm/launchpad-buildd-manager/config.yaml
index 58cbfe4..caac316 100644
--- a/charm/launchpad-buildd-manager/config.yaml
+++ b/charm/launchpad-buildd-manager/config.yaml
@@ -52,6 +52,28 @@ options:
       YAML-encoded dictionary mapping pillars to dictionaries of
       configuration items to set for CI builds of those pillars.
     default: ""
+  fetch_service_control_admin_secret:
+    type: string
+    description: >
+      Admin secret for requesting sessions from the fetch service.
+    default: ""
+  fetch_service_control_admin_username:
+    type: string
+    description: Admin username for fetch service.
+    default: ""
+  fetch_service_control_endpoint:
+    type: string
+    description: Endpoint for fetch service control service.
+    default: ""
+  fetch_service_host:
+    type: string
+    description: >
+      Fetch service host, it could be either a single instance 
+      or a load balancer in front.
+    default: ""
+  fetch_service_port:
+    type: int
+    description: Fetch service port.
   socket_timeout:
     type: int
     description: >
diff --git a/charm/launchpad-buildd-manager/templates/launchpad-buildd-manager-lazr.conf b/charm/launchpad-buildd-manager/templates/launchpad-buildd-manager-lazr.conf
index 3641a19..aed4cdf 100644
--- a/charm/launchpad-buildd-manager/templates/launchpad-buildd-manager-lazr.conf
+++ b/charm/launchpad-buildd-manager/templates/launchpad-buildd-manager-lazr.conf
@@ -18,6 +18,10 @@ authentication_timeout: {{ authentication_timeout }}
 {{- opt("builder_proxy_auth_api_endpoint", builder_proxy_auth_api_endpoint) }}
 {{- opt("builder_proxy_host", builder_proxy_host) }}
 {{- opt("builder_proxy_port", builder_proxy_port) }}
+{{- opt("fetch_service_control_admin_username", fetch_service_control_admin_username) }}
+{{- opt("fetch_service_control_endpoint", fetch_service_control_endpoint) }}
+{{- opt("fetch_service_host", fetch_service_host) }}
+{{- opt("fetch_service_port", fetch_service_port) }}
 root: {{ buildd_manager_dir }}
 socket_timeout: {{ socket_timeout }}
 virtualized_socket_timeout: {{ virtualized_socket_timeout }}
diff --git a/charm/launchpad-buildd-manager/templates/launchpad-buildd-manager-secrets-lazr.conf b/charm/launchpad-buildd-manager/templates/launchpad-buildd-manager-secrets-lazr.conf
index af20066..7637fcb 100644
--- a/charm/launchpad-buildd-manager/templates/launchpad-buildd-manager-secrets-lazr.conf
+++ b/charm/launchpad-buildd-manager/templates/launchpad-buildd-manager-secrets-lazr.conf
@@ -15,4 +15,4 @@
 
 [builddmaster]
 {{- opt("builder_proxy_auth_api_admin_secret", builder_proxy_auth_api_admin_secret) }}
-
+{{- opt("fetch_service_control_admin_secret", fetch_service_control_admin_secret) }}
diff --git a/lib/lp/services/config/schema-lazr.conf b/lib/lp/services/config/schema-lazr.conf
index bbfe8b8..fed991a 100644
--- a/lib/lp/services/config/schema-lazr.conf
+++ b/lib/lp/services/config/schema-lazr.conf
@@ -1880,14 +1880,14 @@ fetch_service_control_admin_secret: none
 # Admin username for fetch service.
 fetch_service_control_admin_username: none
 
-# Endpoint for fetch service authentication service
+# Endpoint for fetch service control service.
 fetch_service_control_endpoint: none
 
 # Fetch service host, it could be either a single instance 
-# or a load balancer in front
+# or a load balancer in front.
 fetch_service_host: none
 
-# Fetch service port
+# Fetch service port.
 fetch_service_port: none
 
 # Optional sources.list entry to send to build workers when doing snap