cambridge: Adjust configuration for move to xs.citrite.net subnet

The Cambridge osstest instance is moving from the .cam.xci-test.com
infrastructure to the xs.citrite.net infrastructure. Adjust the
configuration accordingly.

- The database has been moved from osstestdb.db.cam.xci-test.com to a
  new dedicate pgres server at osstestdb.xs.citrite.net. The data has
  been transfered. (README.dev is updated to use the production
  instance's name instead)
- DHCP leases now come from dns1.uk.xensource.com:5556
- PXE has switched to /usr/groups/netboot. Also switch the templates
  to use %name%/pxelinux.cfg with a symlink from
  pxelinux.cfg/%ipaddrhex%, which will make it easier to find relevant
  files.
- osstser1 is not in the .xs.citrite.net domain
- Logs mount point is now /home/osstest not /home/xc_osstest.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/README.dev b/README.dev
index ae8f7d680efa190fd20df6f6dafd61e2e947542e..4df723709d14d3dc9c466e0d4f90dbc61d8f6584 100644 (file)
--- a/README.dev
+++ b/README.dev
@@ -1,7 +1,7 @@
 Database access
 ===============
 $ cat ~/.xen-osstest/db-password 
-$ psql -d osstestdb -h osstestdb.db.cam.xci-test.com
+$ psql -d osstestdb -h db
 <password>
 
 Borrowing a machine

diff --git a/production-config-cambridge b/production-config-cambridge
index 8480f8149b5f6194c45b409893080aed7b2c39e6..3f04c8703b489ad4d20279f5ae159c71631ebe3b 100644 (file)
--- a/production-config-cambridge
+++ b/production-config-cambridge
@@ -23,7 +23,7 @@ HostDB_Executive_NoConfigDB 1
 
 OwnerDaemonHost owner.daemon.osstest.xs.citrite.net
 QueueDaemonHost queue.daemon.osstest.xs.citrite.net
-ExecutiveDbnamePat dbname=<dbname>;user=<whoami>;host=<dbname>.db.cam.xci-test.com;password=<~/.xen-osstest/db-password>
+ExecutiveDbnamePat dbname=<dbname>;user=<whoami>;host=osstestdb.xs.citrite.net;password=<~/.xen-osstest/db-password>
 
 HostnameSortSwapWords 1
 
@@ -32,9 +32,9 @@ NetNameservers 10.80.248.2 10.80.16.28 10.80.16.67
 
 Timezone Europe/London
 
-Images /home/xc_osstest/images
+Images /home/osstest/images
 
-PubBaseDir /home/xc_osstest
+PubBaseDir /home/osstest
 
 OverlayLocal /export/home/osstest/overlay-local
 
@@ -61,11 +61,12 @@ END
 
 PlanRogueAllocationDuration= 86400*7
 
-TftpPath /home/xc_tftpboot/pxe/
+TftpPath /usr/groups/netboot/
 TftpPlayDir osstest/
 TftpTmpDir osstest/tmp/
 TftpPxeDir /
-TftpPxeTemplates %ipaddrhex%/pxelinux.cfg
+TftpPxeTemplates %name%/pxelinux.cfg
+TftpPxeTemplatesReal pxelinux.cfg/%ipaddrhex%
 
 TftpPxeGroup osstest
 TftpDiVersion 2015-06-23
@@ -82,12 +83,12 @@ XenUseUser osstest
 DebianMirrorHost 10.80.16.196
 
 HostProp_NtpServer ntp.uk.xensource.com
-HostProp_DhcpWatchMethod leases dhcp3 woking.cam.xci-test.com:5556
+HostProp_DhcpWatchMethod leases dhcp3 dns1.uk.xensource.com:5556
 
 DebianPreseed= <<'END'
 END
 
-HostProp_Serial sympathy osstser1.cam.xci-test.com
+HostProp_Serial sympathy osstser1.xs.citrite.net
 HostProp_GenEtherPrefixBase 5a:36:0e:00
 #                                      :00:01 guest number in job appended
 #                                    ^^ xor'd with low 8 bits of flight