launchpad-reviewers team mailing list archive

[Colin Watson <mp+431997@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad-mojo-specs/+git/private:vbuilder-clamav-database-mirror into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

Commit message:
Add a clamav-database-mirror unit

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad-mojo-specs/+git/private/+merge/431997

This will give builders the ability to fetch malware definition files without each having to fetch them from scratch from database.clamav.net, which got us rate-limited last time we tried.

I'm only deploying one of these for now.  We may want to retrofit some kind of high availability later, but I'd like to make sure that the general scheme works before going to that effort.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad-mojo-specs/+git/private:vbuilder-clamav-database-mirror into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
index a66d308..b585028 100644
--- a/vbuilder/bundle.yaml
+++ b/vbuilder/bundle.yaml
@@ -378,6 +378,12 @@ applications:
       openstack-tenant-name: "{{ openstack_tenant_name }}"
       openstack-username: "{{ openstack_username }}"
       vbuilders: '{{ vbuilders("lgw01", vbuilders_lgw01) }}'
+  clamav-database-mirror:
+    charm: ch:clamav-database-mirror
+    constraints: "{{ extra_constraints }}"
+    num_units: 1
+    options:
+      http-proxy: "http://squid.internal:3128/";
   ntp:
     charm: cs:ntp
     options:
@@ -385,7 +391,8 @@ applications:
   # We need to configure telegraf explicitly here because we use custom
   # plugins.  The subordinates spec will set up the relations.
   telegraf:
-    charm: cs:~llama-charmers-next/telegraf
+    charm: ch:telegraf
+    channel: candidate
     expose: true
     options:
       extra_plugins: |-
@@ -428,3 +435,4 @@ relations:
   - ["vbuilder-manage-bos02", "ntp"]
   - ["vbuilder-manage-lcy02", "ntp"]
   - ["vbuilder-manage-lgw01", "ntp"]
+  - ["clamav-database-mirror", "ntp"]