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

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

diff --git a/master.yaml b/master.yaml
index f06530b..bae55e6 100644 (file)
--- a/master.yaml
+++ b/master.yaml
@@ -19,22 +19,27 @@ authz:
     auth: no
   - cell: net.mit.edu
     auth: no
-  - cell: dev.mit.edu
-    auth: no
 
 build:
  pockets:
   prod:
    acl: *adminacl
    apt: stable
+   distro: hardy
+  precise-prod:
+   acl: *adminacl
+   apt: precise-stable
+   distro: precise
   dev:
-   acl: system:xvm-dev
+   acl: *adminacl
    apt: unstable
    allow_backtracking: yes
-  precise:
-   acl: system:xvm-dev
-   apt: precise
+   distro: hardy
+  precise-dev:
+   acl: *adminacl
+   apt: precise-unstable
    allow_backtracking: yes
+   distro: precise
  tagger:
   name: Invirt Build Server
   email: invirt@mit.edu
@@ -53,6 +58,7 @@ build:
   post_submit: *post_commit
   failed_submit: *post_commit
   post_add_repo: *post_commit
+ repo_access: system:xvm-dev
  repo_admin: system:xvm-root
 
 console:
@@ -62,10 +68,10 @@ console:
 cluster:
  rings:
   - bind: 18.4.58.0
-    mcast: 239.255.252.0
+    mcast: 239.255.252.2
     port: 5405
   - bind: 18.4.59.0
-    mcast: 239.255.252.1
+    mcast: 239.255.252.3
     port: 5405
 
 db:
@@ -98,28 +104,44 @@ dns:
 
 hosts: # hosts on which VMs run
  - hostname: citadel-station.mit.edu
-   internal_ip: citadel-station-internal
+   internal_ips:
+    - 18.4.58.16
+    - 18.5.58.16
    ip: 18.181.0.221
  - hostname: aperture-science.mit.edu
-   internal_ip: aperture-science-internal
+   internal_ips:
+    - 18.4.58.17
+    - 18.5.58.17
    ip: 18.181.0.222
  - hostname: shadow-moses.mit.edu
-   internal_ip: shadow-moses-internal
+   internal_ips:
+    - 18.4.58.18
+    - 18.5.58.18
    ip: 18.181.0.223
  - hostname: arklay-mansion.mit.edu
-   internal_ip: arklay-mansion-internal
+   internal_ips:
+    - 18.4.58.19
+    - 18.5.58.19
    ip: 18.181.0.224
  - hostname: discovery-one.mit.edu
-   internal_ip: discovery-one-internal
+   internal_ips:
+    - 18.4.58.20
+    - 18.5.58.20
    ip: 18.181.0.225
  - hostname: global-dynamics.mit.edu
-   internal_ip: global-dynamics-internal
+   internal_ips:
+    - 18.4.58.21
+    - 18.5.58.21
    ip: 18.181.0.99
  - hostname: babylon-four.mit.edu
-   internal_ip: babylon-four-internal
+   internal_ips:
+    - 18.4.58.22
+    - 18.5.58.22
    ip: 18.181.0.100
  - hostname: moonbase-alpha.mit.edu
-   internal_ip: moonbase-alpha-internal
+   internal_ips:
+    - 18.4.58.23
+    - 18.5.58.23
    ip: 18.181.0.101
 
 kerberos:
@@ -132,6 +154,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.mit.edu
@@ -140,17 +165,27 @@ remote:
 git:
  uri: git://xvm.mit.edu
 
+noc:
+ - 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
 
 vnc:
  base_port: 10003
  proxy_ip: 18.181.0.62
+ signing_keystore_path: /etc/invirt/secrets/codesign.keystore
+ signing_key_alias: cert-manager.com
 
 web:
  baseuri: https://xvm.mit.edu/
  hostname: xvm.mit.edu
- errormail: *contact
+ errormail: xvm-errors@mit.edu
  errormail_exclude:
   - broder
   - price
@@ -159,13 +194,16 @@ web:
   - quentin
   - gdb
   - mitchb
+  - achernya
+  - dvorak42
+  - glasgall
 
 network:
  netmask: 255.255.0.0
  gateway: 18.181.0.1
 
 xen:
- iface: eth2
+ iface: xenbr2
 
 iscsi:
  targets:
@@ -179,6 +217,12 @@ iscsi:
  - ip: 18.4.59.139
    ifaces:
    - eth1
+ - ip: 18.4.58.160
+   ifaces:
+   - eth0
+ - ip: 18.4.59.160
+   ifaces:
+   - eth1
 
 lvm:
  vg: xenvg