Updated master.yaml dvorak42 0.80
authorSteven Valdez <dvorak42@mit.edu>
Tue, 6 Aug 2013 19:34:21 +0000 (15:34 -0400)
committerSteven Valdez <dvorak42@mit.edu>
Tue, 6 Aug 2013 19:34:21 +0000 (15:34 -0400)
12 files changed:
debian/changelog
debian/compat
debian/control
debian/rules
debian/xvm-devconfig.install
invirt.list
k5login
master.yaml
sysvms/s_console
sysvms/s_master
sysvms/s_remote
zone

index bc4d633..b15a079 100644 (file)
@@ -1,8 +1,102 @@
-xvm-devconfig (0.77) unstable; urgency=low
+xvm-devconfig (0.80) unstable; urgency=low
 
-  * Elaborated internal_ip's
+  * Merged prodconfig changes into devconfig.
+
+ -- Steven Valdez <dvorak42@mit.edu>  Tue, 06 Aug 2013 15:33:56 -0400
+
+xvm-devconfig (0.79) unstable; urgency=low
+
+  * Elaborated internal_ip's.
 
  -- Peter Iannucci <iannucci@mit.edu>  Mon, 01 Jul 2013 21:35:00 -0400
+
+xvm-devconfig (0.78~glasgall10achernya1) precise; urgency=low
+
+  * Switch to dh7
+  * Bump standards version
+
+ -- Alexander Chernyakhovsky <achernya@mit.edu>  Sat, 01 Jun 2013 14:22:49 -0400
+
+xvm-devconfig (0.78~glasgall10) precise; urgency=low
+
+  * oops, leading whitespace
+
+ -- Adam Glasgall <glasgall@mit.edu>  Tue, 07 May 2013 23:57:10 -0400
+
+xvm-devconfig (0.78~glasgall9) precise; urgency=low
+
+  * Readd black-mesa to the hosts list now that it's running precise
+
+ -- Adam Glasgall <glasgall@mit.edu>  Tue, 07 May 2013 23:56:26 -0400
+
+xvm-devconfig (0.78~glasgall8) precise; urgency=low
+
+  * Change xen.iface to xenbr0, now that we're managing the bridge
+    ourselves instead of letting Xen do it.
+
+ -- Adam Glasgall <glasgall@mit.edu>  Sun, 05 May 2013 22:48:58 -0400
+
+xvm-devconfig (0.78~glasgall7dvorak423) precise; urgency=low
+
+  * Removed unused clusters for precise and updated zone file.
+
+ -- Steven Valdez <dvorak42@mit.edu>  Wed, 01 May 2013 01:20:30 -0400
+
+xvm-devconfig (0.78~glasgall7dvorak422) precise; urgency=low
+
+  * Updated machine links from dev.xvm.mit.edu to staging.xvm.mit.edu
+
+ -- Steven Valdez <dvorak42@mit.edu>  Wed, 01 May 2013 00:45:19 -0400
+
+xvm-devconfig (0.78~glasgall7dvorak421) precise; urgency=low
+
+  * Updated the DNS IP and fixed web URI.
+
+ -- Steven Valdez <dvorak42@mit.edu>  Wed, 01 May 2013 00:03:54 -0400
+
+xvm-devconfig (0.78~glasgall7) precise; urgency=low
+
+  * Oops, update the console server IP too.
+
+ -- Adam Glasgall <glasgall@mit.edu>  Mon, 29 Apr 2013 23:42:01 -0400
+
+xvm-devconfig (0.78~glasgall6) precise; urgency=low
+
+  * MOAR s/-dev/-staging/;.
+
+ -- Adam Glasgall <glasgall@mit.edu>  Mon, 29 Apr 2013 23:30:11 -0400
+
+xvm-devconfig (0.78~glasgall5) precise; urgency=low
+
+  * Yet more s/-dev/-staging/.
+
+ -- Adam Glasgall <glasgall@mit.edu>  Sun, 28 Apr 2013 16:39:35 -0400
+
+xvm-devconfig (0.78~glasgall4) precise; urgency=low
+
+  * More s/-dev/-staging/.
+
+ -- Adam Glasgall <glasgall@mit.edu>  Wed, 24 Apr 2013 20:20:38 -0400
+
+xvm-devconfig (0.78~glasgall3) precise; urgency=low
+
+  * Update sysvm configs, including (temporarily) changing their 
+    hostnames to -staging
+
+ -- Adam Glasgall <glasgall@mit.edu>  Mon, 01 Apr 2013 21:41:47 -0400
+
+xvm-devconfig (0.78~glasgall2) precise; urgency=low
+
+  * Change dist to precise in invirt.list
+
+ -- Adam Glasgall <glasgall@mit.edu>  Wed, 20 Mar 2013 23:19:23 -0700
+
+xvm-devconfig (0.78~glasgall1) precise; urgency=low
+
+  * No-change rebuild to supersede version in prod repo
+
+ -- Adam Glasgall <glasgall@mit.edu>  Wed, 20 Mar 2013 23:15:12 -0700
+
 xvm-devconfig (0.76) unstable; urgency=low
 
   * Package invirt.list once more, and add the xvm-dev apt repo
index 7ed6ff8..7f8f011 100644 (file)
@@ -1 +1 @@
-5
+7
index b091fb6..1495c86 100644 (file)
@@ -2,8 +2,8 @@ Source: xvm-devconfig
 Section: servers
 Priority: important
 Maintainer: SIPB XVM Project <xvm@mit.edu>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5)
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 7.0.50~)
+Standards-Version: 3.9.3
 
 Package: xvm-devconfig
 Architecture: all
index 74f3404..b3399e5 100755 (executable)
@@ -1,8 +1,7 @@
 #!/usr/bin/make -f
+%:
+       dh $@
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-binary-install/xvm-devconfig::
-       # Versions of CDBS newer than ours do this for us
-       dh_lintian -pxvm-devconfig
-       install -m 0644 -D k5login $(DEB_DESTDIR)/root/.k5login
+override_dh_install:
+       dh_install
+       mv debian/xvm-devconfig/root/k5login debian/xvm-devconfig/root/.k5login
index b667c49..b2cf6ef 100644 (file)
@@ -2,3 +2,4 @@ master.yaml etc/invirt
 zone etc/invirt
 sysvms etc/xen
 invirt.list etc/apt/sources.list.d
+k5login /root
index 61760b1..31b7248 100644 (file)
@@ -1,4 +1,4 @@
 deb     http://xvm.mit.edu/invirt unstable main invirt-system
 deb-src http://xvm.mit.edu/invirt unstable main invirt-system
-deb     http://xvm-dev.mit.edu/invirt unstable main invirt-system
-deb-src http://xvm-dev.mit.edu/invirt unstable main invirt-system
+deb     http://xvm-dev.mit.edu/invirt precise-unstable main invirt-system
+deb-src http://xvm-dev.mit.edu/invirt precise-unstable main invirt-system
diff --git a/k5login b/k5login
index a3d3666..7e1c74d 100644 (file)
--- a/k5login
+++ b/k5login
@@ -2,62 +2,22 @@ achernya@ATHENA.MIT.EDU
 achernya/root@ATHENA.MIT.EDU
 adehnert@ATHENA.MIT.EDU
 adehnert/root@ATHENA.MIT.EDU
-afarrell@ATHENA.MIT.EDU
-afarrell/root@ATHENA.MIT.EDU
-andersk@ATHENA.MIT.EDU
-andersk/root@ATHENA.MIT.EDU
-bbaren@ATHENA.MIT.EDU
-bbaren/root@ATHENA.MIT.EDU
 broder@ATHENA.MIT.EDU
 broder/root@ATHENA.MIT.EDU
-burrows@ATHENA.MIT.EDU
-burrows/root@ATHENA.MIT.EDU
-ecprice@ATHENA.MIT.EDU
-ecprice/root@ATHENA.MIT.EDU
-ezyang@ATHENA.MIT.EDU
-ezyang/root@ATHENA.MIT.EDU
-fischerl@ATHENA.MIT.EDU
-gdb@ATHENA.MIT.EDU
-gdb/root@ATHENA.MIT.EDU
 geofft@ATHENA.MIT.EDU
 geofft/root@ATHENA.MIT.EDU
-gyz@ATHENA.MIT.EDU
-gyz/root@ATHENA.MIT.EDU
 hartmans@ATHENA.MIT.EDU
 hartmans/root@ATHENA.MIT.EDU
 iannucci@ATHENA.MIT.EDU
 iannucci/root@ATHENA.MIT.EDU
-jiawen@ATHENA.MIT.EDU
-jiawen/root@ATHENA.MIT.EDU
-jontec@ATHENA.MIT.EDU
-jontec/root@ATHENA.MIT.EDU
-madars@ATHENA.MIT.EDU
 mitchb@ATHENA.MIT.EDU
 mitchb/root@ATHENA.MIT.EDU
-nathan_@ATHENA.MIT.EDU
-nathan_/root@ATHENA.MIT.EDU
-oremanj@ATHENA.MIT.EDU
-oremanj/root@ATHENA.MIT.EDU
-ppasupat@ATHENA.MIT.EDU
-ppasupat/root@ATHENA.MIT.EDU
 price@ATHENA.MIT.EDU
 price/root@ATHENA.MIT.EDU
 pweaver@ATHENA.MIT.EDU
 pweaver/root@ATHENA.MIT.EDU
 quentin@ATHENA.MIT.EDU
 quentin/root@ATHENA.MIT.EDU
-tabbott@ATHENA.MIT.EDU
-tabbott/root@ATHENA.MIT.EDU
-y_z@ATHENA.MIT.EDU
-y_z/root@ATHENA.MIT.EDU
-djbclark@ATHENA.MIT.EDU
-dxiao@ATHENA.MIT.EDU
-jproulx@ATHENA.MIT.EDU
-eschwa@ATHENA.MIT.EDU
-jon@CSAIL.MIT.EDU
-schwa@CSAIL.MIT.EDU
-dennison@ATHENA.MIT.EDU
-dennison/root@ATHENA.MIT.EDU
 dvorak42@ATHENA.MIT.EDU
 dvorak42/root@ATHENA.MIT.EDU
 glasgall@ATHENA.MIT.EDU
index 981d29f..46817a5 100644 (file)
@@ -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
@@ -12,32 +10,24 @@ authz:
  afs:
   cells:
   - cell: athena.mit.edu
-    auth: no
+    auth: yes
   - cell: sipb.mit.edu
     auth: yes
   - cell: zone.mit.edu
-    auth: no
+    auth: yes
   - cell: ops.mit.edu
     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
   precise-dev:
-   acl: system:xvm-dev
+   acl: *adminacl
    apt: precise-unstable
    allow_backtracking: yes
    distro: precise
@@ -49,24 +39,57 @@ 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
    zephyr:
-    class: xvm-auto
+    class: xvm-dev-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
 
+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
 
+db:
+ uri: postgres://invirt@xvm-dev.mit.edu/invirt
+ host: xvm-dev.mit.edu
+ ip: 18.181.0.80
+ port: 5432
+ user: invirt
+ dbname: invirt
+
+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: *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:
@@ -85,55 +108,35 @@ hosts: # hosts on which VMs run
     - isla-nublar-internal
    ip: 18.181.0.102
 
-db:
- uri: postgres://invirt@xvm-dev.mit.edu/invirt
- host: xvm-dev.mit.edu
- ip: 18.181.0.80
- port: 5432
- user: invirt
- dbname: invirt
+kerberos:
+ realm: ATHENA.MIT.EDU
 
-console:
- hostname: xvm-console-dev.mit.edu
- ip: 18.181.0.230
+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-dev.mit.edu
  ip: 18.181.0.231
 
-dns:
- contact: *contact
- domains:  # first one is advertised
-  - dev.xvm.mit.edu
-  - 2.181.18.in-addr.arpa
-  - 1.181.18.in-addr.arpa
- nameservers:
-  - hostname: xvm-dev.mit.edu
-    ip: 18.181.0.80
- zone_files:
-  - /etc/invirt/zone
+git:
+ uri: git://xvm-dev.mit.edu
 
-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
+noc:
+ dbname: template1
+ user: nagios
+ ip: 18.181.0.65
 
-mail:
- forward: xvm-dev-auto@mit.edu
-
-network:
- gateway: 18.181.0.1
- netmask: 255.255.0.0
-
-lvm:
- vg: xenvg
+trac:
+ uri: https://xvm.scripts.mit.edu
 
-xen:
- iface: eth0
+vnc:
+ base_port: 10003
+ proxy_ip: 18.181.0.80
 
 web:
  baseuri: https://xvm-dev.mit.edu/
@@ -142,14 +145,12 @@ web:
  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
index 03c01f3..d31137e 100644 (file)
@@ -5,15 +5,15 @@ kernel      = '/boot/vmlinuz-%s' % release
 ramdisk     = '/boot/initrd.img-%s' % release
 memory      = '256'
 
-disk        = ['phy:xenvg/s_console_hda,hda,w']
+disk        = ['phy:xenvg/s_console_xvda,xvda,w']
 
 name        = 's_console'
 
-vif         = [ 'ip=18.181.0.230,mac=00:16:3E:FC:FE:26' ]
+vif         = [ 'ip=18.181.0.219,mac=00:16:3e:07:15:2c' ]
 
 on_poweroff = 'destroy'
 on_reboot   = 'restart'
 on_crash    = 'restart'
 
-root = "/dev/hda1 ro"
+root = "/dev/xvda1 ro"
 extra = '2 console=xvc0'
index 502b61f..f54e022 100644 (file)
@@ -5,15 +5,15 @@ kernel      = '/boot/vmlinuz-%s' % release
 ramdisk     = '/boot/initrd.img-%s' % release
 memory      = '512'
 
-disk        = ['phy:xenvg/s_master_hda,hda,w']
+disk        = ['phy:xenvg/s_master_xvda,xvda,w']
 
 name        = 's_master'
 
-vif         = [ 'ip=18.181.0.80,mac=00:16:3e:6c:1e:f5' ]
+vif         = [ 'ip=18.181.0.214,mac=00:16:3e:0c:13:39' ]
 
 on_poweroff = 'destroy'
 on_reboot   = 'restart'
 on_crash    = 'restart'
 
-root = "/dev/hda1 ro"
+root = "/dev/xvda1 ro"
 extra = '2 console=xvc0'
index 4b69bea..041e161 100644 (file)
@@ -5,15 +5,15 @@ kernel      = '/boot/vmlinuz-%s' % release
 ramdisk     = '/boot/initrd.img-%s' % release
 memory      = '512'
 
-disk        = ['phy:xenvg/s_remote_hda,hda,w']
+disk        = ['phy:xenvg/s_remote_xvda,xvda,w']
 
 name        = 's_remote'
 
-vif         = [ 'ip=18.181.0.231,mac=00:16:3e:26:dc:72' ]
+vif         = [ 'ip=18.181.0.216,mac=00:16:3e:5f:98:b4' ]
 
 on_poweroff = 'destroy'
 on_reboot   = 'restart'
 on_crash    = 'restart'
 
-root = "/dev/hda1 ro"
+root = "/dev/xvda1 ro"
 extra = '2 console=xvc0'
diff --git a/zone b/zone
index b72997d..0e9bab6 100644 (file)
--- a/zone
+++ b/zone
@@ -1,4 +1,4 @@
-@       900     IN      SOA     dev.xvm.mit.edu. xvm-dev.mit.edu. (
+@       900     IN      SOA     staging.xvm.mit.edu. xvm-staging.mit.edu. (
         3
         1d
         1d