From e276da6a13403eff623d5fc0373bf71811bbadd6 Mon Sep 17 00:00:00 2001 From: Adam Glasgall Date: Tue, 7 May 2013 23:36:52 -0400 Subject: [PATCH 1/1] update hosts list; fix vnc proxy ip --- debian/changelog | 7 +++++++ master.yaml | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 12088bc..dfd67cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xvm-devconfig (0.78~glasgall9) UNRELEASED; urgency=low + + * Readd black-mesa to the hosts list now that it's running precise + * Fix IP for vnc proxy + + -- Adam Glasgall Tue, 07 May 2013 23:33:47 -0400 + xvm-devconfig (0.78~glasgall8) precise; urgency=low * Change xen.iface to xenbr0, now that we're managing the bridge diff --git a/master.yaml b/master.yaml index 93c8115..1b8936b 100644 --- a/master.yaml +++ b/master.yaml @@ -68,9 +68,9 @@ cluster: port: 5405 hosts: # hosts on which VMs run -# - hostname: black-mesa.mit.edu -# ip: 18.181.0.60 -# internal_ip: black-mesa-internal +- 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 @@ -140,7 +140,7 @@ web: vnc: base_port: 10003 - proxy_ip: 18.181.0.80 + proxy_ip: 18.181.0.214 trac: uri: https://xvm.scripts.mit.edu -- 1.7.9.5