launchpad-reviewers team mailing list archive

[Laurent Sesques <laurent.sesques@xxxxxxxxxxxxx>]

Laurent Sesques has proposed merging ~sajoupa/launchpad-mojo-specs:physical-machines into launchpad-mojo-specs:master.

Requested reviews:
  The Canonical Sysadmins (canonical-sysadmins)
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~sajoupa/launchpad-mojo-specs/+git/launchpad-mojo-specs/+merge/383599
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~sajoupa/launchpad-mojo-specs:physical-machines into launchpad-mojo-specs:master.

diff --git a/mojo-lp-signing/collect-charms b/mojo-lp-signing/collect-charms
index 328f7d3..12a2a9d 100644
--- a/mojo-lp-signing/collect-charms
+++ b/mojo-lp-signing/collect-charms
@@ -5,7 +5,10 @@ lp-signing			git+https://git.launchpad.net/~launchpad/lp-signing/+git/charm-buil
 
 # Subordinates
 nrpe				cs:nrpe-52
+ntp				cs:ntp
 telegraf			cs:telegraf-27
+turku-agent			cs:~turku-charmers/turku-agent
+ubuntu				cs:ubuntu
 
 {%- if stage_name != "devel" %}
 # Basenode
@@ -15,4 +18,6 @@ postgresql/exec.d				@
 postgresql/exec.d/basenode			lp:basenode;revno=109
 lp-signing/exec.d				@
 lp-signing/exec.d/basenode			lp:basenode;revno=109
+ubuntu/exec.d					@
+ubuntu/exec.d/basenode				lp:basenode
 {%- endif %}
diff --git a/mojo-lp-signing/configs/custom-secgroups-production.yaml b/mojo-lp-signing/configs/custom-secgroups-production.yaml
index 0ddc305..d3c8ad6 100644
--- a/mojo-lp-signing/configs/custom-secgroups-production.yaml
+++ b/mojo-lp-signing/configs/custom-secgroups-production.yaml
@@ -3,6 +3,8 @@ all-machines:
 applications:
     nrpe:
         - nagios-monitored
+    nrpe-physical:
+        - nagios-monitored
     telegraf:
         - metrics
     haproxy:
diff --git a/mojo-lp-signing/golive/collect b/mojo-lp-signing/golive/collect
index 5076849..c20a2cb 100644
--- a/mojo-lp-signing/golive/collect
+++ b/mojo-lp-signing/golive/collect
@@ -1,7 +1,8 @@
 # These are unpinned on the assumption that they should always be the latest when golive
 # is added.
-{%- if stage_name != "production" %}
 canonical-livepatch	cs:canonical-livepatch
-{%- endif %}
 landscape-client	cs:landscape-client
 userdir-ldap		lp:userdir-ldap-charms/userdir-ldap
+{%- if stage_name == "production" %}
+hp-health		lp:canonical-hp-health-charm/built
+{%- endif %}
diff --git a/mojo-lp-signing/golive/services b/mojo-lp-signing/golive/services
index 3633cb7..b7ceb90 100644
--- a/mojo-lp-signing/golive/services
+++ b/mojo-lp-signing/golive/services
@@ -24,13 +24,21 @@ golive:
         account-name: standalone
         tags: juju-managed, devops-instance, {{environment_tag}}
         registration-key: include-file://{{local_dir}}/canonical-is-landscape.key
-{%- if stage_name != "production" %}
     canonical-livepatch:
       charm: canonical-livepatch
       options:
         livepatch_key: include-file://{{local_dir}}/canonical-is-livepatch.key
         livepatch_proxy: http://squid.internal:3128
         snap_proxy: http://squid.internal:3128
+{%- if stage_name == "production" %}
+    physical-hosts:
+      charm: ubuntu
+    nrpe-physical:
+      charm: nrpe
+    hp-health:
+      charm: hp-health
+      options:
+        hp-firmware-info-url: 'http://archive.admin.canonical.com/other/hp-firmware/info.yaml'
 {%- endif %}
     userdir-ldap:
       charm: userdir-ldap
@@ -42,6 +50,13 @@ golive:
     - ["canonical-livepatch", "postgresql"]
     - ["canonical-livepatch", "lp-signing"]
     - ["canonical-livepatch", "nrpe"]
+{%- else %}
+    - ["canonical-livepatch", "physical-hosts"]
+    - ["canonical-livepatch", "nrpe-physical"]
+    - ["hp-health", "physical-hosts"]
+    - ["hp-health", "nrpe-physical"]
+    - ["landscape", "physical-hosts"]
+    - ["userdir-ldap", "physical-hosts"]
 {%- endif %}
     - ["landscape", "haproxy"]
     - ["landscape", "postgresql"]
diff --git a/mojo-lp-signing/services b/mojo-lp-signing/services
index c4a0e48..26000d8 100644
--- a/mojo-lp-signing/services
+++ b/mojo-lp-signing/services
@@ -58,14 +58,21 @@ lp-signing:
 {%- else %}
       num_units: 2
 {%- endif %}
-{%- if stage_name == "production" %}
-      to: ['2', '3']
-{%- endif %}
       options:
         nagios_context: "{{ nagios_context }}"
 {%- if nagios_servicegroups %}
         nagios_servicegroups: "{{ nagios_servicegroups }},{{ nagios_context }}"
 {%- endif %}
+{%- if stage_name == "production" %}
+      to: ['2', '3']
+    turku-agent:
+      charm: turku-agent
+      options:
+        environment_name: prod-launchpad-signing
+        api_auth: include-file://{{local_dir}}/turku.key
+        api_url: https://turku.admin.canonical.com/v1
+        sources: '{"postgresql": { "comment": "PostgreSQL dumps", "path": "/var/lib/postgresql/backups", "frequency": "daily"}}'
+{%- endif %}
     lp-signing:
       charm: lp-signing
       constraints: "{{ signing_constraints }}"
@@ -95,6 +102,23 @@ lp-signing:
     telegraf:
       charm: telegraf
       expose: true
+{%- if stage_name == "production" %}
+    physical-hosts:
+      charm: ubuntu
+      num_units: 2
+      to: ['6', '7']
+    nrpe-physical:
+      charm: nrpe
+      options:
+        hostgroups: "{{ nagios_hostgroups }}"
+        nagios_host_context: "{{ nagios_context }}"
+    ntp:
+      charm: ntp
+      options:
+        nagios_context: "{{ nagios_context }}"
+        nagios_servicegroups: "{{ nagios_servicegroups }}, {{ nagios_context }}"
+        source: "ntp1.canonical.com ntp2.canonical.com ntp3.canonical.com ntp4.canonical.com"
+{%- endif %}
   relations:
     - ["haproxy", "lp-signing"]
     - ["lp-signing:db", "postgresql:db"]
@@ -105,3 +129,9 @@ lp-signing:
     - ["telegraf:haproxy", "haproxy"]
     - ["telegraf:juju-info", "postgresql:juju-info"]
     - ["telegraf:juju-info", "lp-signing"]
+{%- if stage_name == "production" %}
+    - ["postgresql", "turku-agent"]
+    - ["physical-hosts", "nrpe-physical"]
+    - ["physical-hosts", "ntp"]
+    - ["physical-hosts", "telegraf"]
+{%- endif %}
diff --git a/mojo-lp-signing/verify b/mojo-lp-signing/verify
index df9e6ef..07173e1 100755
--- a/mojo-lp-signing/verify
+++ b/mojo-lp-signing/verify
@@ -3,6 +3,9 @@ set -e
 
 TOP="${0%/*}"
 
+# Set EXTRA_SKIP_CHECKS, using '|' as the separator. e.g.
+# EXTRA_SKIP_CHECKS='check_ntpmon|check_hardware' mojo run -m manifest-verify
+
 export EXTRA_SKIP_CHECKS="check_swap${EXTRA_SKIP_CHECKS:+|${EXTRA_SKIP_CHECKS}}"
 
 exec "$TOP/utils/verify"