Merge next branch

2015-03-20 17:15:02 +00:00
parent 6986c6fafd c8bd5c0862
commit 378ba82dbf
15 changed files with 820 additions and 12 deletions
--- a/config.yaml
+++ b/config.yaml
@@ -111,7 +111,7 @@ options:
      with the other members of the HA Cluster.
  ha-mcastport:
    type: int
-    default: 5402
+    default: 5444
    description: |
      Default multicast port number that will be used to communicate between
      HA Cluster nodes.
@@ -208,4 +208,10 @@ options:
          juju-myservice-0
      If you're running multiple environments with the same services in them
      this allows you to differentiate between them.
+  nagios_servicegroups:
+    default: ""
+    type: string
+    description: |
+        A comma-separated list of nagios servicegroups.
+        If left empty, the nagios_context will be used as the servicegroup