Empty merge commit to re-create correct history ordering.

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

diff --git a/master.yaml b/master.yaml
index 93c8115..7385274 100644 (file)
--- a/master.yaml
+++ b/master.yaml
@@ -1,8 +1,6 @@
 contact: &contact xvm-dev@mit.edu
-adminacl: system:xvm-dev
-
-kerberos:
- realm: ATHENA.MIT.EDU
+adminacl: &adminacl system:xvm-dev
+priv_contact: &priv_contact xvm-dev@mit.edu
 
 apt:
  keyid: 625CFE85
@@ -21,26 +19,28 @@ authz:
     auth: no
   - cell: net.mit.edu
     auth: no
-  - cell: dev.mit.edu
-    auth: no
 
 build:
  mirror: true
  pockets:
-  prod:
+  precise-prod:
    acl: system:xvm-root
-   apt: stable
-   distro: hardy
-  dev:
-   acl: system:xvm-dev
-   apt: unstable
-   allow_backtracking: yes
-   distro: hardy
+   apt: precise-stable
+   distro: precise
+  trusty-prod:
+   acl: system:xvm-root
+   apt: trusty-stable
+   distro: trusty
   precise-dev:
-   acl: system:xvm-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
@@ -49,7 +49,7 @@ build:
    zephyr:
     class: xvm-auto
    mail:
-    to: xvm-auto@mit.edu
+    to: xvm-dev-auto@mit.edu
     from: xvm-build-bot@mit.edu
   failed_build: *post_build
   post_commit: &post_commit
@@ -59,28 +59,19 @@ 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:
+ hostname: xvm-console-dev.mit.edu
+ ip: 18.181.0.230
+
 cluster:
  rings:
   - bind: 10.7.0.0
     mcast: 239.255.252.2
     port: 5405
 
-hosts: # hosts on which VMs run
-# - hostname: black-mesa.mit.edu
-#   ip: 18.181.0.60
-#   internal_ip: black-mesa-internal
-# - hostname: torchwood-institute.mit.edu
-#   internal_ip: torchwood-institute-internal
-#   ip: 18.181.0.165
-# - hostname: arkham-asylum.mit.edu
-#   internal_ip: arkham-asylum-internal
-#   ip: 18.181.0.109
- - hostname: isla-nublar.mit.edu
-   internal_ip: isla-nublar-internal
-   ip: 18.181.0.102
-
 db:
  uri: postgres://invirt@xvm-dev.mit.edu/invirt
  host: xvm-dev.mit.edu
@@ -89,26 +80,6 @@ db:
  user: invirt
  dbname: invirt
 
-console:
- hostname: xvm-console-staging.mit.edu
- ip: 18.181.0.219
-
-remote:
- hostname: xvm-remote-staging.mit.edu
- ip: 18.181.0.216
-
-dns:
- contact: *contact
- domains:  # first one is advertised
-  - staging.xvm.mit.edu
-  - 2.181.18.in-addr.arpa
-  - 1.181.18.in-addr.arpa
- nameservers:
-  - hostname: xvm-staging.mit.edu
-    ip: 18.181.0.214
- zone_files:
-  - /etc/invirt/zone
-
 dhcp:
  gateway: 18.181.0.1
  netmask: 255.255.0.0
@@ -118,34 +89,87 @@ dhcp:
   - 18.72.0.3
  search_domain: mit.edu
 
+dns:
+ contact: *contact
+ domains: # first one is advertised
+  - dev.xvm.mit.edu
+  - 2.181.18.in-addr.arpa
+ nameservers:
+  - hostname: xvm-dev.mit.edu
+    ip: 18.181.0.80
+ zone_files:
+  - /etc/invirt/zone
+
+hosts: # hosts on which VMs run
+ - hostname: black-mesa.mit.edu
+   internal_ips:
+    - black-mesa-internal
+   ip: 18.181.0.60
+ - hostname: torchwood-institute.mit.edu
+   internal_ips:
+    - torchwood-institute-internal
+   ip: 18.181.0.165
+ - hostname: arkham-asylum.mit.edu
+   internal_ips:
+    - arkham-asylum-internal
+   ip: 18.181.0.109
+ - hostname: isla-nublar.mit.edu
+   internal_ips:
+    - isla-nublar-internal
+   ip: 18.181.0.102
+
+kerberos:
+ realm: ATHENA.MIT.EDU
+
 mail:
- forward: xvm-dev-auto@mit.edu
+ forward: *priv_contact
 
-network:
- gateway: 18.181.0.1
- netmask: 255.255.0.0
+monitoring:
+ - hostname: sipb-noc.mit.edu
+   ip: 18.181.0.65
+   baseuri: http://sipb-noc.mit.edu/xvm/
 
-lvm:
- vg: xenvg
+remote:
+ hostname: xvm-remote-dev.mit.edu
+ ip: 18.181.0.231
 
-xen:
- iface: xenbr0
+git:
+ uri: git://xvm-dev.mit.edu
+
+noc:
+ dbname: template1
+ user: nagios
+ ip: 18.181.0.65
+
+trac:
+ uri: https://xvm.scripts.mit.edu
+
+vnc:
+ base_port: 10003
+ proxy_ip: 18.181.0.80
 
 web:
- baseuri: https://xvm-staging.mit.edu/
- hostname: xvm-staging.mit.edu
+ baseuri: https://xvm-dev.mit.edu/
+ hostname: xvm-dev.mit.edu
  errormail: *contact
  errormail_exclude:
   - '*'
 
-vnc:
- base_port: 10003
- proxy_ip: 18.181.0.80
+network:
+ netmask: 255.255.0.0
+ gateway: 18.181.0.1
 
-trac:
- uri: https://xvm.scripts.mit.edu
+xen:
+ iface: xenbr2
 
-monitoring:
- - hostname: sipb-noc.mit.edu
-   ip: 18.181.0.65
-   baseuri: http://sipb-noc.mit.edu/xvm/
+lvm:
+ vg: xenvg
+
+iscsi:
+ targets:
+ - ip: 10.7.0.1
+   ifaces:
+   - eth1
+ - ip: 10.8.0.1
+   ifaces:
+   - eth2