get db connection name from config in sipb-xen-update-conserver

[invirt/packages/invirt-console.git] / files / usr / sbin / sipb-xen-update-conserver

diff --git a/files/usr/sbin/sipb-xen-update-conserver b/files/usr/sbin/sipb-xen-update-conserver
index 081bb1c..8d99d64 100755 (executable)
--- a/files/usr/sbin/sipb-xen-update-conserver
+++ b/files/usr/sbin/sipb-xen-update-conserver
@@ -6,7 +6,7 @@ import os
 import socket
 from invirt.config import structs as config
 
-sipb_xen_database.connect('postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen')
+sipb_xen_database.connect(config.db.uri)
 
 def live_vms():
     p = subprocess.Popen(['/usr/sbin/xm', 'list'], stdout=subprocess.PIPE)
@@ -23,13 +23,13 @@ if __name__ == '__main__':
     hostname = socket.getfqdn().lower()
     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])