added decomposition of DB URI (for sipb-xen-console)

[invirt/packages/xvm-devconfig.git] / files / etc / invirt / master.yaml

diff --git a/files/etc/invirt/master.yaml b/files/etc/invirt/master.yaml
index 0792c1f..62f2ff6 100644 (file)
--- a/files/etc/invirt/master.yaml
+++ b/files/etc/invirt/master.yaml
@@ -7,13 +7,20 @@ authz:
    cell: athena.mit.edu
 
 hosts: # hosts on which VMs run
- - black-mesa.mit.edu:
-    ip: 18.181.0.60
- - sx-blade-2.mit.edu:
-    ip: 18.181.0.165
+ - hostname: black-mesa.mit.edu
+   ip: 18.181.0.60
+ - hostname: sx-blade-2.mit.edu
+   ip: 18.181.0.165
 
-db: 
+apt:
+ keyid: AB1A81AA
+
+db:
  uri: postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen
+ host: sipb-xen-dev.mit.edu
+ port: 5432
+ user: sipb-xen
+ dbname: sipb_xen
 
 console:
  hostname: sipb-xen-console.mit.edu
@@ -32,5 +39,9 @@ dns:
     ip: 18.181.0.62
  rootip: 18.181.0.62
 
-web: 
+network:
+ gateway: 18.181.0.1
+ netmask: 255.255.0.0
+
+web:
  baseuri: https://xvm.mit.edu/