Move iSCSI configuration from debconf to master.yaml

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

diff --git a/master.yaml b/master.yaml
index f7434e9..6e4e193 100644 (file)
--- a/master.yaml
+++ b/master.yaml
@@ -3,10 +3,10 @@ adminacl: &adminacl system:xvm-root
 priv_contact: &priv_contact xvm-root@mit.edu
 
 apt:
- keyid: 35AE3C4F
+ keyid: 442461DF
 
 authz:
- mech: xvm.authz.locker
+ name: xvm-locker
  afs:
   cells:
   - cell: athena.mit.edu
@@ -34,11 +34,36 @@ build:
  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_admin: system:xvm-root
 
 console:
  hostname: xvm-console.mit.edu
  ip: 18.181.0.134
 
+cluster:
+ rings:
+  - bind: 10.5.128.0
+    mcast: 239.255.252.0
+    port: 5405
+  - bind: 10.6.128.0
+    mcast: 239.255.252.1
+    port: 5405
+
 db:
  uri: postgres://invirt@xvm.mit.edu/invirt
  host: xvm.mit.edu
@@ -69,13 +94,26 @@ dns:
 
 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
 
 kerberos:
  realm: ATHENA.MIT.EDU
@@ -91,9 +129,8 @@ remote:
  hostname: xvm-remote.mit.edu
  ip: 18.181.0.188
 
-svn:
- repopath: /afs/sipb.mit.edu/project/xvm/svn
- uri: https://xvm.mit.edu:1111
+git:
+ uri: git://xvm.mit.edu
 
 trac:
  uri: https://xvm.scripts.mit.edu
@@ -113,7 +150,25 @@ web:
   - andersk
   - quentin
   - hartmans
+  - gdb
+
+network:
+ netmask: 255.255.0.0
+ gateway: 18.181.0.1
 
 xen:
- network:
-  iface: eth2
+ iface: eth2
+
+iscsi:
+ targets:
+ - ip: 10.5.128.128
+   iface: eth0
+ - ip: 10.5.128.128
+   iface: eth1
+ - ip: 10.5.128.139
+   iface: eth0
+ - ip: 10.6.128.139
+   iface: eth1
+
+lvm:
+ vg: xenvg