X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/xvm-prodconfig.git/blobdiff_plain/e8109dceb13e0f4f989fd5c0c5cc10a333f051cf..7694ef6222d1b016c25c3ad0b7e2e2d29f698197:/master.yaml

diff --git a/master.yaml b/master.yaml
index 029624a..06034a1 100644
--- a/master.yaml
+++ b/master.yaml
@@ -1,23 +1,78 @@
-authn:
- - type: kerberos
-   realm: ATHENA.MIT.EDU
+contact: &contact xvm@mit.edu
+adminacl: &adminacl system:xvm-root
+priv_contact: &priv_contact xvm-root@mit.edu
+
+apt:
+ keyid: 442461DF
 
 authz:
- - type: afs
-   cell: athena.mit.edu
+ name: xvm-locker
+ afs:
+  cells:
+  - cell: athena.mit.edu
+    auth: yes
+  - cell: sipb.mit.edu
+    auth: yes
+  - cell: zone.mit.edu
+    auth: yes
+  - cell: ops.mit.edu
+    auth: no
+  - cell: net.mit.edu
+    auth: no
 
-hosts: # hosts on which VMs run
- - hostname: citadel-station.mit.edu
-   ip: 18.181.0.221
- - hostname: aperture-science.mit.edu
-   ip: 18.181.0.222
- - hostname: shadow-moses.mit.edu
-   ip: 18.181.0.223
- - hostname: arklay-mansion.mit.edu
-   ip: 18.181.0.224
+build:
+ pockets:
+  prod:
+   acl: *adminacl
+   apt: stable
+   distro: hardy
+  precise-prod:
+   acl: *adminacl
+   apt: precise-stable
+   distro: precise
+  dev:
+   acl: *adminacl
+   apt: unstable
+   allow_backtracking: yes
+   distro: hardy
+  precise-dev:
+   acl: *adminacl
+   apt: precise-unstable
+   allow_backtracking: yes
+   distro: precise
+ tagger:
+  name: Invirt Build Server
+  email: invirt@mit.edu
+ hooks:
+  post_build: &post_build
+   zephyr:
+    class: xvm-auto
+   mail:
+    to: xvm-auto@mit.edu
+    from: xvm-build-bot@mit.edu
+  failed_build: *post_build
+  post_commit: &post_commit
+   zephyr:
+    class: xvm-auto
+  pre_build: *post_commit
+  post_submit: *post_commit
+  failed_submit: *post_commit
+  post_add_repo: *post_commit
+ repo_access: system:xvm-dev
+ repo_admin: system:xvm-root
 
-apt:
- keyid: 35AE3C4F
+console:
+ hostname: xvm-console.mit.edu
+ ip: 18.181.0.134
+
+cluster:
+ rings:
+  - bind: 18.4.58.0
+    mcast: 239.255.252.0
+    port: 5405
+  - bind: 18.4.59.0
+    mcast: 239.255.252.1
+    port: 5405
 
 db:
  uri: postgres://invirt@xvm.mit.edu/invirt
@@ -27,53 +82,109 @@ db:
  user: invirt
  dbname: invirt
 
-remote:
- hostname: xvm-remote.mit.edu
- ip: 18.181.0.188
+dhcp:
+ gateway: 18.181.0.1
+ netmask: 255.255.0.0
+ dns:
+  - 18.70.0.160
+  - 18.71.0.151
+  - 18.72.0.3
+ search_domain: mit.edu
 
 dns:
- contact: xvm@mit.edu
+ contact: *contact
  domains: # first one is advertised
   - xvm.mit.edu
+  - 2.181.18.in-addr.arpa
  nameservers:
   - hostname: xvm.mit.edu
     ip: 18.181.0.62
  zone_files:
   - /etc/invirt/zone
 
-dhcp:
- gateway: 18.181.0.1
- netmask: 255.255.0.0
- dns:
-  - 18.70.0.160
-  - 18.71.0.151
-  - 18.72.0.3
- search_domain: mit.edu
+hosts: # hosts on which VMs run
+ - hostname: citadel-station.mit.edu
+   internal_ip: citadel-station-internal
+   ip: 18.181.0.221
+ - hostname: aperture-science.mit.edu
+   internal_ip: aperture-science-internal
+   ip: 18.181.0.222
+ - hostname: shadow-moses.mit.edu
+   internal_ip: shadow-moses-internal
+   ip: 18.181.0.223
+ - hostname: arklay-mansion.mit.edu
+   internal_ip: arklay-mansion-internal
+   ip: 18.181.0.224
+# - hostname: discovery-one.mit.edu
+#   internal_ip: discovery-one-internal
+#   ip: 18.181.0.225
+# - hostname: global-dynamics.mit.edu
+#   internal_ip: global-dynamics-internal
+#   ip: 18.181.0.99
+# - hostname: babylon-four.mit.edu
+#   internal_ip: babylon-four-internal
+#   ip: 18.181.0.100
+# - hostname: moonbase-alpha.mit.edu
+#   internal_ip: moonbase-alpha-internal
+#   ip: 18.181.0.101
+
+kerberos:
+ realm: ATHENA.MIT.EDU
+
+mail:
+ forward: *priv_contact
+
+monitoring:
+ - hostname: sipb-noc.mit.edu
+   ip: 18.181.0.65
+   baseuri: http://sipb-noc.mit.edu/xvm/
+
+remote:
+ hostname: xvm-remote.mit.edu
+ ip: 18.181.0.188
+
+git:
+ uri: git://xvm.mit.edu
+
+trac:
+ uri: https://xvm.scripts.mit.edu
+
+vnc:
+ base_port: 10003
+ proxy_ip: 18.181.0.62
 
 web:
  baseuri: https://xvm.mit.edu/
  hostname: xvm.mit.edu
-. errormail: xvm@mit.edu
- adminacl: system:xvm-root
+ errormail: xvm-errors@mit.edu
  errormail_exclude:
   - broder
   - price
   - ecprice
   - andersk
   - quentin
-  - hartmans
+  - gdb
+  - mitchb
 
-console:
- hostname: xvm-console.mit.edu
- ip: 18.181.0.134
+network:
+ netmask: 255.255.0.0
+ gateway: 18.181.0.1
 
-svn:
- repopath: /afs/sipb.mit.edu/project/xvm/svn
- uri: https://xvm.mit.edu:1111
+xen:
+ iface: eth2
 
-trac:
- uri: https://xvm.scripts.mit.edu
+iscsi:
+ targets:
+ - ip: 18.4.58.128
+   ifaces:
+   - eth0
+   - eth1
+ - ip: 18.4.58.139
+   ifaces:
+   - eth0
+ - ip: 18.4.59.139
+   ifaces:
+   - eth1
 
-vnc:
- base_port: 10003
- proxy_ip: 18.181.0.62
+lvm:
+ vg: xenvg