Merge lp:~alejdg/mojo/mojo-specs into lp:mojo/mojo-specs

[Alexandre Gomes]

Update ubuntu-repository-cache charm testing spec

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

[Ryan Finnie (fo0bar)]

See comments below

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 126

[lp:~alejdg/mojo/mojo-specs]

126. By Alexandre Gomes on 2018-09-14

Update ubuntu-repository-cache charm testing spec

Reviewed-on: https://code.launchpad.net/~alejdg/mojo/mojo-specs/+merge/354976
Reviewed-by: Ryan Finnie <email address hidden>

=== modified file 'charm-testing/ubuntu-repository-cache/collect'
--- charm-testing/ubuntu-repository-cache/collect	2018-09-06 20:48:55 +0000
+++ charm-testing/ubuntu-repository-cache/collect	2018-09-14 23:04:42 +0000
@@ -1,2 +1,3 @@
 ubuntu-repository-cache   lp:ubuntu-repository-cache
 nrpe        cs:nrpe
+haproxy     cs:haproxy
\ No newline at end of file

=== modified file 'charm-testing/ubuntu-repository-cache/deploy'
--- charm-testing/ubuntu-repository-cache/deploy	2018-09-06 20:48:55 +0000
+++ charm-testing/ubuntu-repository-cache/deploy	2018-09-14 23:04:42 +0000
@@ -1,10 +1,29 @@
+{%- set stage_dir = spec_dir + "/" + stage %}
+
 ubuntu-repository-cache:
     series: {{series}}
     services:
         ubuntu-repository-cache:
             charm: ubuntu-repository-cache
             series: {{series}}
+            options:
+                mirror-series: {{series}}
+                squid_snmp: True
+                sync-on-start: True
         nrpe:
             charm: nrpe
+        haproxy:
+            charm: haproxy
+            num_units: 1
+            expose: True
+            options:
+                default_mode: tcp
+                package_status: install
+                enable_monitoring: True
+                ssl_cert: DEFAULT
+                ssl_key: ""
+                services: include-file://{{stage_dir}}/haproxy-services.yaml
     relations:
         - ['ubuntu-repository-cache:nrpe-external-master', 'nrpe:nrpe-external-master']
+        - ['haproxy:reverseproxy', 'ubuntu-repository-cache:website']
+        - ["nrpe:nrpe-external-master", "haproxy:nrpe-external-master"]