Merge ~ines-almeida/launchpad-mojo-specs:lp-add-buildd-manager-qastaging-config into launchpad-mojo-specs:master

[Ines Almeida]

Fix qastaging builder proxy configuration

Add missing qastaging launchpad-buildd-manager configuration.
Update builder proxy allowed IPs to allow for git.qastaging cloning

This configuration was tested in qastaging.
Link to a successful build with the builder proxy: https://qastaging.launchpad.net/~ines-almeida/+snap/sleepy-test-fetch-service/+build/2298608

[Simone Pelosi (pelpsi)]

LGTM!

review: Approve

diff --git a/lp-builder-proxy/bundle.yaml b/lp-builder-proxy/bundle.yaml
index f3c776a..b7cf594 100644
--- a/lp-builder-proxy/bundle.yaml
+++ b/lp-builder-proxy/bundle.yaml
@@ -118,6 +118,8 @@ applications:
             # ppa.dogfood.content.paddev.net, used by apt during "snapcraft
             # pull" on qastaging.
             91.189.90.138,
+            # git.qastaging.paddev.net, potentially used by "snapcraft pull".
+            162.213.34.25, 162.213.34.26,
 {%- endif %}
             # bazaar.launchpad.net, potentially used by "snapcraft pull".
             185.125.189.232, 185.125.189.235,
diff --git a/lp/bundle.yaml b/lp/bundle.yaml
index 96819ab..9dc0075 100644
--- a/lp/bundle.yaml
+++ b/lp/bundle.yaml
@@ -393,6 +393,9 @@
 {%-   set backend_database_user = "migrationadmin" %}
 {%-   set buildd_manager_active = True %}
 {%-   set buildd_manager_database_name = "launchpad_qastaging_buildd_manager" %}
+{%-   set builder_proxy_auth_api_admin_username = "admin-qastaging.launchpad.net" %}
+{%-   set builder_proxy_auth_api_endpoint = "http://builder-proxy-auth.staging.lp.internal:8080/tokens" %}
+{%-   set builder_proxy_host = "builder-proxy.staging.lp.internal" %}
 {%-   set bzr_imports_root_url = "/home/supermirror/importd-push-branches" %}
 {%-   set bzr_lp_prefix = "lp://qastaging/" %}
 {%-   set bzr_lp_url_hosts = "qastaging" %}