MIT DNS server renumbering

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

diff --git a/master.yaml b/master.yaml
index 46817a5..804e314 100644 (file)
--- a/master.yaml
+++ b/master.yaml
@@ -10,27 +10,37 @@ authz:
  afs:
   cells:
   - cell: athena.mit.edu
-    auth: yes
+    auth: no
   - cell: sipb.mit.edu
     auth: yes
   - cell: zone.mit.edu
-    auth: yes
+    auth: no
   - cell: ops.mit.edu
     auth: no
   - cell: net.mit.edu
     auth: no
 
 build:
+ mirror: true
  pockets:
   precise-prod:
    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
@@ -44,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
@@ -54,7 +64,7 @@ build:
 
 console:
  hostname: xvm-console-dev.mit.edu
- ip: 18.181.0.230
+ ip: 18.25.128.230
 
 cluster:
  rings:
@@ -65,48 +75,50 @@ cluster:
 db:
  uri: postgres://invirt@xvm-dev.mit.edu/invirt
  host: xvm-dev.mit.edu
- ip: 18.181.0.80
+ ip: 18.25.128.80
  port: 5432
  user: invirt
  dbname: invirt
 
 dhcp:
- gateway: 18.181.0.1
- netmask: 255.255.0.0
+ leasetime: 3600
  dns:
-  - 18.70.0.160
-  - 18.71.0.151
-  - 18.72.0.3
+  - 18.0.70.160
+  - 18.0.71.151
+  - 18.0.72.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
+    ip: 18.25.128.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
+    - 10.7.0.3
+    - 10.8.0.3
+   ip: 18.25.128.60
  - hostname: torchwood-institute.mit.edu
    internal_ips:
-    - torchwood-institute-internal
-   ip: 18.181.0.165
+    - 10.7.0.5
+    - 10.8.0.5
+   ip: 18.25.128.165
  - hostname: arkham-asylum.mit.edu
    internal_ips:
-    - arkham-asylum-internal
-   ip: 18.181.0.109
+    - 10.7.0.2
+    - 10.8.0.2
+   ip: 18.25.128.109
  - hostname: isla-nublar.mit.edu
    internal_ips:
-    - isla-nublar-internal
-   ip: 18.181.0.102
+    - 10.7.0.4
+    - 10.8.0.4
+   ip: 18.25.128.102
 
 kerberos:
  realm: ATHENA.MIT.EDU
@@ -116,27 +128,27 @@ mail:
 
 monitoring:
  - hostname: sipb-noc.mit.edu
-   ip: 18.181.0.65
+   ip: 18.4.60.65
    baseuri: http://sipb-noc.mit.edu/xvm/
 
 remote:
  hostname: xvm-remote-dev.mit.edu
- ip: 18.181.0.231
+ ip: 18.25.128.231
 
 git:
  uri: git://xvm-dev.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.80
+ proxy_ip: 18.25.128.80
 
 web:
  baseuri: https://xvm-dev.mit.edu/
@@ -145,12 +157,17 @@ web:
  errormail_exclude:
   - '*'
 
-network:
- netmask: 255.255.0.0
- gateway: 18.181.0.1
-
 xen:
  iface: xenbr2
 
 lvm:
  vg: xenvg
+
+iscsi:
+ targets:
+ - ip: 10.7.0.1
+   ifaces:
+   - eth1
+ - ip: 10.8.0.1
+   ifaces:
+   - eth2