ship s_master etc rather than s_master.mako etc

svn path=/trunk/packages/xvm-prodconfig/; revision=2089

diff --git a/debian/changelog b/debian/changelog
index 0b32865..30a686a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xvm-prodconfig (1.1.9) unstable; urgency=low
+
+  * Ship the sysvm Xen config files themselves, rather than Mako templates.
+
+ -- Greg Price <price@mit.edu>  Tue, 03 Feb 2009 01:20:16 -0500
+
 xvm-prodconfig (1.1.8) unstable; urgency=low
 
   * Move sysvms/* into xvm-prodconfig from invirt-xen-config

diff --git a/sysvms/s_console.mako b/sysvms/s_console
similarity index 75%
rename from sysvms/s_console.mako
rename to sysvms/s_console
index b10212c..e27f0cf 100644 (file)
--- a/sysvms/s_console.mako
+++ b/sysvms/s_console
@@ -1,6 +1,4 @@
-<%
-from invirt.config import structs as cfg
-%>
+
 import os
 
 release     = os.uname()[2]
@@ -12,7 +10,7 @@ disk        = ['phy:xenvg/s_console_hda,hda,w']
 
 name        = 's_console'
 
-vif         = [ 'ip=${cfg.console.ip},mac=00:16:3E:7E:E4:DE' ]
+vif         = [ 'ip=18.181.0.134,mac=00:16:3E:7E:E4:DE' ]
 
 on_poweroff = 'destroy'
 on_reboot   = 'restart'
@@ -20,3 +18,4 @@ on_crash    = 'restart'
 
 root = '/dev/hda1 ro'
 extra = '2 console=xvc0'
+

diff --git a/sysvms/s_master.mako b/sysvms/s_master
similarity index 79%
rename from sysvms/s_master.mako
rename to sysvms/s_master
index 192f249..2fba5ca 100644 (file)
--- a/sysvms/s_master.mako
+++ b/sysvms/s_master
@@ -1,6 +1,4 @@
-<%
-from invirt.config import structs as cfg
-%>
+
 import os
 
 release     = os.uname()[2]
@@ -13,7 +11,7 @@ disk        = ['phy:xenvg/s_master_hda,hda,w',
 
 name        = 's_master'
 
-vif         = [ 'ip=${cfg.db.ip},mac=00:16:3E:5F:C1:D4' ]
+vif         = [ 'ip=18.181.0.62,mac=00:16:3E:5F:C1:D4' ]
 
 on_poweroff = 'destroy'
 on_reboot   = 'restart'
@@ -21,3 +19,4 @@ on_crash    = 'restart'
 
 root       = '/dev/hda1 ro'
 extra = '2 console=xvc0'
+

diff --git a/sysvms/s_remote.mako b/sysvms/s_remote
similarity index 75%
rename from sysvms/s_remote.mako
rename to sysvms/s_remote
index d710e46..7744102 100644 (file)
--- a/sysvms/s_remote.mako
+++ b/sysvms/s_remote
@@ -1,6 +1,4 @@
-<%
-from invirt.config import structs as cfg
-%>
+
 import os
 
 release     = os.uname()[2]
@@ -12,7 +10,7 @@ disk        = ['phy:xenvg/s_remote_hda,hda,w']
 
 name        = 's_remote'
 
-vif         = [ 'ip=${cfg.remote.ip},mac=00:16:3E:7F:C2:55' ]
+vif         = [ 'ip=18.181.0.188,mac=00:16:3E:7F:C2:55' ]
 
 on_poweroff = 'destroy'
 on_reboot   = 'restart'
@@ -20,3 +18,4 @@ on_crash    = 'restart'
 
 root = "/dev/hda1 ro"
 extra = '2 console=xvc0'
+