Merge ~cjwatson/launchpad-mojo-specs:codeimport-subordinates into launchpad-mojo-specs:master

[Colin Watson]

codeimport: Remove golive

Use https://git.launchpad.net/~mojo-maintainers/mojo/+git/subordinates instead.

[Cristian Gonzalez (cristiangsp)]

Looks good!

review: Approve

diff --git a/lp-codeimport/collect-charms b/lp-codeimport/collect-charms
index a0a9fa0..724a5fa 100644
--- a/lp-codeimport/collect-charms
+++ b/lp-codeimport/collect-charms
@@ -3,7 +3,6 @@ lp-codeimport			git+https://git.launchpad.net/~launchpad/lp-codeimport/+git/char
 
 # Subordinates
 nrpe				cs:nrpe-52
-telegraf			cs:telegraf-27
 
 {%- if stage_name != "devel" %}
 # Basenode
diff --git a/lp-codeimport/configs/custom-secgroups-production.yaml b/lp-codeimport/configs/custom-secgroups-production.yaml
index 3f5a829..4547841 100644
--- a/lp-codeimport/configs/custom-secgroups-production.yaml
+++ b/lp-codeimport/configs/custom-secgroups-production.yaml
@@ -1,9 +1,8 @@
 applications:
     nrpe:
         - nagios-monitored
-    telegraf:
-        - metrics
     lp-codeimport:
+        - metrics
         - rsync-logs
 rules:
     metrics:
diff --git a/lp-codeimport/golive/collect b/lp-codeimport/golive/collect
deleted file mode 100644
index c33df5e..0000000
--- a/lp-codeimport/golive/collect
+++ /dev/null
@@ -1,5 +0,0 @@
-# These are unpinned on the assumption that they should always be the latest when golive
-# is added.
-canonical-livepatch	cs:canonical-livepatch
-landscape-client	cs:landscape-client
-userdir-ldap		cs:userdir-ldap
diff --git a/lp-codeimport/golive/manifest b/lp-codeimport/golive/manifest
deleted file mode 100644
index 93c9f76..0000000
--- a/lp-codeimport/golive/manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-collect config=golive/collect
-deploy config=golive/services target=golive
-include config=manifests/verify
diff --git a/lp-codeimport/golive/services b/lp-codeimport/golive/services
deleted file mode 100644
index 1f15f42..0000000
--- a/lp-codeimport/golive/services
+++ /dev/null
@@ -1,36 +0,0 @@
-{%- if stage_name == "production" %}
-{%-   set environment_tag = "devops-production" %}
-{%- elif stage_name in ("staging", "qastaging") %}
-{%-   set environment_tag = "devops-staging" %}
-{%- else %}
-{%-   set environment_tag = "devops-unknown" %}
-{%- endif -%}
-golive:
-  series: {{ series }}
-  services:
-    lp-codeimport:
-      charm: lp-codeimport
-    nrpe:
-      charm: nrpe
-    landscape:
-      charm: landscape-client
-      options:
-        url: https://landscape.is.canonical.com/message-system
-        ping-url: http://landscape.is.canonical.com/ping
-        account-name: standalone
-        tags: juju-managed, devops-instance, {{environment_tag}}
-        registration-key: include-file://{{local_dir}}/canonical-is-landscape.key
-    canonical-livepatch:
-      charm: canonical-livepatch
-      options:
-        livepatch_key: include-file://{{local_dir}}/canonical-is-livepatch.key
-        livepatch_proxy: http://squid.internal:3128
-    userdir-ldap:
-      charm: userdir-ldap
-      options:
-        apt-repo-spec: "deb http://archive.admin.canonical.com/ubuntu {{ series }}-cat main"
-  relations:
-    - ["canonical-livepatch", "lp-codeimport"]
-    - ["canonical-livepatch", "nrpe"]
-    - ["landscape", "lp-codeimport"]
-    - ["userdir-ldap", "lp-codeimport"]
diff --git a/lp-codeimport/services b/lp-codeimport/services
index 8872e01..3cf072e 100644
--- a/lp-codeimport/services
+++ b/lp-codeimport/services
@@ -109,9 +109,5 @@ lp-codeimport:
         export_nagios_definitions: true
         nagios_master: "{{ nagios_master }}"
 {%- endif %}
-    telegraf:
-      charm: telegraf
-      expose: true
   relations:
     - ["nrpe", "lp-codeimport"]
-    - ["telegraf:juju-info", "lp-codeimport"]