From 0a1e08ddff0b15e3ad74302735fd4d561990d902 Mon Sep 17 00:00:00 2001 From: pietro Date: Fri, 8 May 2009 03:38:34 -0700 Subject: rename template to .erb --- manifests/xen.pp | 2 +- templates/xen-tools.conf | 279 ------------------------------------------- templates/xen-tools.conf.erb | 278 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 279 insertions(+), 280 deletions(-) delete mode 100644 templates/xen-tools.conf create mode 100644 templates/xen-tools.conf.erb diff --git a/manifests/xen.pp b/manifests/xen.pp index a6734a6..f7d90fd 100644 --- a/manifests/xen.pp +++ b/manifests/xen.pp @@ -133,7 +133,7 @@ class xen::dom0::debian inherits xen::dom0::base { file { "/etc/xen-tools/xen-tools.conf": owner => root, group => 0, mode => 0644, - content => template("virtual/xen-tools.conf"), + content => template("virtual/xen-tools.conf.erb"), require => Package['xen-tools']; } } diff --git a/templates/xen-tools.conf b/templates/xen-tools.conf deleted file mode 100644 index c3999ad..0000000 --- a/templates/xen-tools.conf +++ /dev/null @@ -1,279 +0,0 @@ -## -# /etc/xen-tools/xen-tools.conf -## -# -# This is the global configuration file for the scripts included -# within the xen-tools package. -# -# For more details please see: -# -# http://xen-tools.org/ -# -## - - -## -# -# File Format -# ----------- -# -# Anything following a '#' character is ignored as a comment. -# -# Otherwise the format of this file "key = value". The value of -# any keys in this file may be constructed via the output of a command. -# -# For example: -# -# kernel = /boot/vmlinuz-`uname -r` -# -## - - - -# -## -# Output directory for storing loopback images. -# -# If you choose to use loopback images, which are simple to manage but -# slower than LVM partitions, then specify a directory here and uncomment -# the line. -# -# New instances will be stored in subdirectories named after their -# hostnames. -# -## -# dir = /home/xen -# - -# -## -# -# If you don't wish to use loopback images then you may specify an -# LVM volume group here instead -# -## -lvm = <%= real_xen_lvm -%> - - -# -## -# -# Installation method. -# -# There are four distinct methods which you may to install a new copy -# of Linux to use in your Xen guest domain: -# -# - Installation via the debootstrap command. -# - Installation via the rpmstrap command. -# - Installation via the rinse command. -# - Installation by copying a directory containing a previous installation. -# - Installation by untarring a previously archived image. -# -# NOTE That if you use the "untar", or "copy" options you should ensure -# that the image you're left with matches the 'dist' setting later in -# this file. -# -# -## -# -# -# install-method = [ debootstrap | rinse | rpmstrap | copy | tar ] -# -# -install-method = debootstrap - -# -# If you're using the "copy", or "tar" installation methods you must -# need to specify the source location to copy from, or the source -# .tar file to unpack. -# -# You may specify that with a line such as: -# -# install-source = /path/to/copy -# install-source = /some/path/img.tar -# -# - -# -## -# Command definitions. -## -# -# The "rinse", and "rpmstrap" commands are hardwired into -# the script, but if you wish to modify the commands which are executed -# when installing new systems by a "copy", "debootstrap", or "tar" method -# you can do so here: -# -# (This allows you to install from a .tar.bz file, rather than a plain -# tar file, use cdebootstrap, etc.) -# -# install-method=copy: -# copy-cmd = /bin/cp -a $src/* $dest -# -# install-method=debootstrap: -# debootstrap-cmd=/usr/sbin/debootstrap -# -# install-method=tar: -# tar-cmd = /bin/tar --numeric-owner -xvf $src -# -# - - - -# -## -# Disk and Sizing options. -## -# -size = 4Gb # Disk image size. -memory = 512Mb # Memory size -swap = 1Gb # Swap size -# noswap = 1 # Don't use swap at all for the new system. -fs = ext3 # use the EXT3 filesystem for the disk image. -dist = lenny # Default distribution to install. -image = sparse # Specify sparse vs. full disk images. - -# -# Currently supported and tested distributions include: -# -# via Debootstrap: -# -# Debian: -# sid, sarge, etch, lenny. -# -# Ubuntu: -# edgy, feisty, dapper. -# -# via Rinse: -# centos-4, centos-5. -# fedora-core-4, fedora-core-5, fedora-core-6, fedora-core-7 -# -# - - - -## -# Networking setup values. -## - -# -# Uncomment and adjust these network settings if you wish to give your -# new instances static IP addresses. -# -gateway = 198.252.153.1 -netmask = 255.255.255.0 -broadcast = 198.252.153.255 -# -# Uncomment this if you wish the images to use DHCP -# -# dhcp = 1 - - -## -# Misc options -## - -# -# Uncomment the following line if you wish to disable the caching -# of downloaded .deb files when using debootstrap to install images. -# -# cache = no -# - -# -# Uncomment the following line if you wish to interactively setup -# a new root password for images. -# -passwd = 1 - -# -# If you'd like all accounts on your host system which are not present -# on the guest system to be copied over then uncomment the following line. -# -# accounts = 1 -# - -# -# Default kernel and ramdisk to use for the virtual servers -# -kernel = /boot/vmlinuz-`uname -r` -initrd = /boot/initrd.img-`uname -r` - -# -# The architecture to use when using debootstrap, rinse, or rpmstrap. -# -# This is most useful on 64 bit host machines, for other systems it -# doesn't need to be used. -# -# arch=[i386|amd64] -# - -# -# The default mirror for debootstrap to install Debian-derived distributions -# -<% if in_colo == "no" -%> -mirror = http://ftp.us.debian.org/debian/ -<% else -%> -mirror = http://macaw.riseup.net:9999/debian/ -<% end %> -# -# A mirror suitable for use when installing the Dapper release of Ubuntu. -# -# mirror = http://gb.archive.ubuntu.com/ubuntu/ - -# -# If you like you could use per-distribution mirrors, which will -# be more useful if you're working in an environment where you want -# to regularly use multiple distributions: -# -# mirror_sid=http://ftp.us.debian.org/debian -# mirror_sarge=http://ftp.us.debian.org/debian -# mirror_etch=http://ftp.us.debian.org/debian -# mirror_dapper=http://archive.ubuntu.com/ubuntu -# mirror_edgy=http://archive.ubuntu.com/ubuntu -# mirror_feisty=http://archive.ubuntu.com/ubuntu -# mirror_gutsy=http://archive.ubuntu.com/ubuntu - - -# -# Filesystem options for the different filesystems we support. -# -ext3_options = noatime,nodiratime,errors=remount-ro -ext2_options = noatime,nodiratime,errors=remount-ro -xfs_options = defaults -reiser_options = defaults - -# -# Uncomment if you wish newly created images to boot once they've been -# created. -# -boot = 1 - - -# -# If you're using the lenny or later version of the Xen guest kernel you will -# need to make sure that you use 'hvc0' for the guest serial device, -# and 'xvdX' instead of 'sdX' for serial devices. -# -# You may specify the things to use here: -# -# serial_device = hvc0 #default -# serial_device = tty1 -# -# disk_device = xvda #default -# disk_device = sda -# - - -# -# Here we specify the output directory which the Xen configuration -# files will be written to, and the suffix to give them. -# -# Historically xen-tools have created configuration files in /etc/xen, -# and given each file the name $hostname.cfg. If you want to change -# that behaviour you may do so here. -# -# -# output = /etc/xen -# extension = .cfg -# diff --git a/templates/xen-tools.conf.erb b/templates/xen-tools.conf.erb new file mode 100644 index 0000000..6aa97f5 --- /dev/null +++ b/templates/xen-tools.conf.erb @@ -0,0 +1,278 @@ +## +# /etc/xen-tools/xen-tools.conf +## +# +# This is the global configuration file for the scripts included +# within the xen-tools package. +# +# For more details please see: +# +# http://xen-tools.org/ +# +## + + +## +# +# File Format +# ----------- +# +# Anything following a '#' character is ignored as a comment. +# +# Otherwise the format of this file "key = value". The value of +# any keys in this file may be constructed via the output of a command. +# +# For example: +# +# kernel = /boot/vmlinuz-`uname -r` +# +## + + + +# +## +# Output directory for storing loopback images. +# +# If you choose to use loopback images, which are simple to manage but +# slower than LVM partitions, then specify a directory here and uncomment +# the line. +# +# New instances will be stored in subdirectories named after their +# hostnames. +# +## +# dir = /home/xen +# + +# +## +# +# If you don't wish to use loopback images then you may specify an +# LVM volume group here instead +# +## +lvm = <%= real_xen_lvm %> + +# +## +# +# Installation method. +# +# There are four distinct methods which you may to install a new copy +# of Linux to use in your Xen guest domain: +# +# - Installation via the debootstrap command. +# - Installation via the rpmstrap command. +# - Installation via the rinse command. +# - Installation by copying a directory containing a previous installation. +# - Installation by untarring a previously archived image. +# +# NOTE That if you use the "untar", or "copy" options you should ensure +# that the image you're left with matches the 'dist' setting later in +# this file. +# +# +## +# +# +# install-method = [ debootstrap | rinse | rpmstrap | copy | tar ] +# +# +install-method = debootstrap + +# +# If you're using the "copy", or "tar" installation methods you must +# need to specify the source location to copy from, or the source +# .tar file to unpack. +# +# You may specify that with a line such as: +# +# install-source = /path/to/copy +# install-source = /some/path/img.tar +# +# + +# +## +# Command definitions. +## +# +# The "rinse", and "rpmstrap" commands are hardwired into +# the script, but if you wish to modify the commands which are executed +# when installing new systems by a "copy", "debootstrap", or "tar" method +# you can do so here: +# +# (This allows you to install from a .tar.bz file, rather than a plain +# tar file, use cdebootstrap, etc.) +# +# install-method=copy: +# copy-cmd = /bin/cp -a $src/* $dest +# +# install-method=debootstrap: +# debootstrap-cmd=/usr/sbin/debootstrap +# +# install-method=tar: +# tar-cmd = /bin/tar --numeric-owner -xvf $src +# +# + + + +# +## +# Disk and Sizing options. +## +# +size = 4Gb # Disk image size. +memory = 512Mb # Memory size +swap = 1Gb # Swap size +# noswap = 1 # Don't use swap at all for the new system. +fs = ext3 # use the EXT3 filesystem for the disk image. +dist = lenny # Default distribution to install. +image = sparse # Specify sparse vs. full disk images. + +# +# Currently supported and tested distributions include: +# +# via Debootstrap: +# +# Debian: +# sid, sarge, etch, lenny. +# +# Ubuntu: +# edgy, feisty, dapper. +# +# via Rinse: +# centos-4, centos-5. +# fedora-core-4, fedora-core-5, fedora-core-6, fedora-core-7 +# +# + + + +## +# Networking setup values. +## + +# +# Uncomment and adjust these network settings if you wish to give your +# new instances static IP addresses. +# +gateway = 198.252.153.1 +netmask = 255.255.255.0 +broadcast = 198.252.153.255 +# +# Uncomment this if you wish the images to use DHCP +# +# dhcp = 1 + + +## +# Misc options +## + +# +# Uncomment the following line if you wish to disable the caching +# of downloaded .deb files when using debootstrap to install images. +# +# cache = no +# + +# +# Uncomment the following line if you wish to interactively setup +# a new root password for images. +# +passwd = 1 + +# +# If you'd like all accounts on your host system which are not present +# on the guest system to be copied over then uncomment the following line. +# +# accounts = 1 +# + +# +# Default kernel and ramdisk to use for the virtual servers +# +kernel = /boot/vmlinuz-`uname -r` +initrd = /boot/initrd.img-`uname -r` + +# +# The architecture to use when using debootstrap, rinse, or rpmstrap. +# +# This is most useful on 64 bit host machines, for other systems it +# doesn't need to be used. +# +# arch=[i386|amd64] +# + +# +# The default mirror for debootstrap to install Debian-derived distributions +# +<% if in_colo == "no" -%> +mirror = http://ftp.us.debian.org/debian/ +<% else -%> +mirror = http://macaw.riseup.net:9999/debian/ +<% end %> +# +# A mirror suitable for use when installing the Dapper release of Ubuntu. +# +# mirror = http://gb.archive.ubuntu.com/ubuntu/ + +# +# If you like you could use per-distribution mirrors, which will +# be more useful if you're working in an environment where you want +# to regularly use multiple distributions: +# +# mirror_sid=http://ftp.us.debian.org/debian +# mirror_sarge=http://ftp.us.debian.org/debian +# mirror_etch=http://ftp.us.debian.org/debian +# mirror_dapper=http://archive.ubuntu.com/ubuntu +# mirror_edgy=http://archive.ubuntu.com/ubuntu +# mirror_feisty=http://archive.ubuntu.com/ubuntu +# mirror_gutsy=http://archive.ubuntu.com/ubuntu + + +# +# Filesystem options for the different filesystems we support. +# +ext3_options = noatime,nodiratime,errors=remount-ro +ext2_options = noatime,nodiratime,errors=remount-ro +xfs_options = defaults +reiser_options = defaults + +# +# Uncomment if you wish newly created images to boot once they've been +# created. +# +boot = 1 + + +# +# If you're using the lenny or later version of the Xen guest kernel you will +# need to make sure that you use 'hvc0' for the guest serial device, +# and 'xvdX' instead of 'sdX' for serial devices. +# +# You may specify the things to use here: +# +# serial_device = hvc0 #default +# serial_device = tty1 +# +# disk_device = xvda #default +# disk_device = sda +# + + +# +# Here we specify the output directory which the Xen configuration +# files will be written to, and the suffix to give them. +# +# Historically xen-tools have created configuration files in /etc/xen, +# and given each file the name $hostname.cfg. If you want to change +# that behaviour you may do so here. +# +# +# output = /etc/xen +# extension = .cfg +# -- cgit v1.2.3