Changeset 813 for trunk/packages

Timestamp:

Aug 1, 2008, 11:50:51 PM (16 years ago)

Author:

price

Message:

get console-server hostname from config in sipb-xen-update-conserver

Location:

trunk/packages/sipb-xen-console-server

Files:

• config.todo (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• files/usr/sbin/sipb-xen-update-conserver (modified) (1 diff)

trunk/packages/sipb-xen-console-server/config.todo

@@ -2 +2 @@
 files/etc/conserver/conserver.cf.sipb-xen: master-vm name
 files/usr/sbin/sipb-xen-update-conserver: db uri
-files/usr/sbin/sipb-xen-update-conserver: proxy hostname

trunk/packages/sipb-xen-console-server/debian/changelog

@@ -2 +2 @@
 
   * use invirt.config rather than /etc/invirt/* directly
+  * get console-server hostname from config
 
- -- Greg Price <price@mit.edu>  Fri,  1 Aug 2008 23:41:00 -0400
+ -- Greg Price <price@mit.edu>  Fri,  1 Aug 2008 23:49:26 -0400
 
 sipb-xen-console-server (2.04) unstable; urgency=low

trunk/packages/sipb-xen-console-server/files/usr/sbin/sipb-xen-update-conserver

@@ -24 +24 @@
     realm = config.authn[0].realm
     principal = 'host/'+hostname+'@'+realm
-    config = '\n'.join('console %s { master %s; }' % (vm, hostname)
-                       for vm in live_vms())
+    conftext = '\n'.join('console %s { master %s; }' % (vm, hostname)
+                         for vm in live_vms())
     f = open('/etc/conserver/sipb-xen-consoles.cf', 'w')
-    f.write(config)
+    f.write(conftext)
     f.close()
     reload_conserver()
     subprocess.call(['/usr/bin/kinit', '-k', '-t', '/etc/krb5.keytab',
                      principal])
-    subprocess.call(['/usr/bin/remctl', 'sipb-xen-console.mit.edu',
-                     'console', 'update', config])
+    subprocess.call(['/usr/bin/remctl', config.console.hostname,
+                     'console', 'update', conftext])