Make noc a list and add new sipb-noc address to monitoring and noc sections

[invirt/packages/xvm-devconfig.git] / master.yaml

diff --git a/master.yaml b/master.yaml
index 56dcd27..0e2b49c 100644 (file)
--- a/master.yaml
+++ b/master.yaml
@@ -27,11 +27,20 @@ build:
    acl: system:xvm-root
    apt: precise-stable
    distro: precise
+  trusty-prod:
+   acl: system:xvm-root
+   apt: trusty-stable
+   distro: trusty
   precise-dev:
    acl: *adminacl
    apt: precise-unstable
    allow_backtracking: yes
    distro: precise
+  trusty-dev:
+   acl: *adminacl
+   apt: trusty-unstable
+   allow_backtracking: yes
+   distro: trusty
  tagger:
   name: Invirt Build Server
   email: invirt@mit.edu
@@ -45,7 +54,7 @@ build:
   failed_build: *post_build
   post_commit: &post_commit
    zephyr:
-    class: xvm-dev-auto
+    class: xvm-auto
   pre_build: *post_commit
   post_submit: *post_commit
   failed_submit: *post_commit
@@ -119,6 +128,9 @@ monitoring:
  - hostname: sipb-noc.mit.edu
    ip: 18.181.0.65
    baseuri: http://sipb-noc.mit.edu/xvm/
+ - hostname: sipb-noc.mit.edu
+   ip: 18.4.60.65
+   baseuri: http://sipb-noc.mit.edu/xvm/
 
 remote:
  hostname: xvm-remote-dev.mit.edu
@@ -128,9 +140,12 @@ git:
  uri: git://xvm-dev.mit.edu
 
 noc:
- dbname: template1
- user: nagios
- ip: 18.181.0.65
+ - dbname: template1
+   user: nagios
+   ip: 18.181.0.65
+ - dbname: template1
+   user: nagios
+   ip: 18.4.60.65
 
 trac:
  uri: https://xvm.scripts.mit.edu
@@ -155,3 +170,12 @@ xen:
 
 lvm:
  vg: xenvg
+
+iscsi:
+ targets:
+ - ip: 10.7.0.1
+   ifaces:
+   - eth1
+ - ip: 10.8.0.1
+   ifaces:
+   - eth2