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)
1  2 
debian/changelog
master.yaml

@@@ -1,90 -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
diff --cc master.yaml
@@@ -1,8 -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 -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
     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
  
- 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
 + ip: 18.181.0.80
 + port: 5432
 + 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
 + 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:
+     - 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
 -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: 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
 -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-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.214
 - 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