ia64/xen-unstable

changeset 17710:fbc8cf8e0d6b

Remove xend-config-xenapi.sxp and xm-config-xenapi.xml

The contents of these two files are duplicate of xend-config.sxp and
xm-config.xml. They only add maintaining burdens to developers.

This patch removes them permanently.

Signed-off-by: Zhigang Wang <zhigang.x.wang@oracle.com>
author Keir Fraser <keir.fraser@citrix.com>
date Fri May 23 09:47:45 2008 +0100 (2008-05-23)
parents fbf09143c2e5
children 4c8fc8def9b3
files tools/examples/xend-config-xenapi.sxp tools/examples/xm-config-xenapi.xml
line diff
     1.1 --- a/tools/examples/xend-config-xenapi.sxp	Fri May 23 09:35:57 2008 +0100
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,196 +0,0 @@
     1.4 -# -*- sh -*-
     1.5 -
     1.6 -#
     1.7 -# Xend configuration file.
     1.8 -#
     1.9 -
    1.10 -# This example configuration is appropriate for an installation that 
    1.11 -# utilizes a bridged network configuration. Access to xend via http
    1.12 -# is disabled.  
    1.13 -
    1.14 -# Commented out entries show the default for that entry, unless otherwise
    1.15 -# specified.
    1.16 -
    1.17 -#(logfile /var/log/xen/xend.log)
    1.18 -#(loglevel DEBUG)
    1.19 -
    1.20 -
    1.21 -# The Xen-API server configuration.  (Please note that this server is
    1.22 -# available as an UNSUPPORTED PREVIEW in Xen 3.0.4, and should not be relied
    1.23 -# upon).
    1.24 -#
    1.25 -# This value configures the ports, interfaces, and access controls for the
    1.26 -# Xen-API server.  Each entry in the list starts with either unix, a port
    1.27 -# number, or an address:port pair.  If this is "unix", then a UDP socket is
    1.28 -# opened, and this entry applies to that.  If it is a port, then Xend will
    1.29 -# listen on all interfaces on that TCP port, and if it is an address:port
    1.30 -# pair, then Xend will listen on the specified port, using the interface with
    1.31 -# the specified address.
    1.32 -#
    1.33 -# The subsequent string configures the user-based access control for the
    1.34 -# listener in question.  This can be one of "none" or "pam", indicating either
    1.35 -# that users should be allowed access unconditionally, or that the local
    1.36 -# Pluggable Authentication Modules configuration should be used.  If this
    1.37 -# string is missing or empty, then "pam" is used.
    1.38 -#
    1.39 -# The final string gives the host-based access control for that listener. If
    1.40 -# this is missing or empty, then all connections are accepted.  Otherwise,
    1.41 -# this should be a space-separated sequence of regular expressions; any host
    1.42 -# with a fully-qualified domain name or an IP address that matches one of
    1.43 -# these regular expressions will be accepted.
    1.44 -#
    1.45 -# Example: listen on TCP port 9363 on all interfaces, accepting connections
    1.46 -# only from machines in example.com or localhost, and allow access through
    1.47 -# the unix domain socket unconditionally:
    1.48 -#
    1.49 -   (xen-api-server ((9363 none)))
    1.50 -#                    (unix none)))
    1.51 -#
    1.52 -# Optionally, the TCP Xen-API server can use SSL by specifying the private
    1.53 -# key and certificate location:
    1.54 -#
    1.55 -#                    (9367 pam '' /etc/xen/xen-api.key /etc/xen/xen-api.crt)
    1.56 -#
    1.57 -# Default:
    1.58 -#   (xen-api-server ((unix)))
    1.59 -
    1.60 -
    1.61 -#(xend-http-server no)
    1.62 -#(xend-unix-server no)
    1.63 -#(xend-tcp-xmlrpc-server no)
    1.64 -#(xend-unix-xmlrpc-server yes)
    1.65 -#(xend-relocation-server no)
    1.66 -(xend-relocation-server yes)
    1.67 -
    1.68 -#(xend-unix-path /var/lib/xend/xend-socket)
    1.69 -
    1.70 -
    1.71 -# Address and port xend should use for the legacy TCP XMLRPC interface, 
    1.72 -# if xend-tcp-xmlrpc-server is set.
    1.73 -#(xend-tcp-xmlrpc-server-address 'localhost')
    1.74 -#(xend-tcp-xmlrpc-server-port 8006)
    1.75 -
    1.76 -# SSL key and certificate to use for the legacy TCP XMLRPC interface.
    1.77 -# Setting these will mean that this port serves only SSL connections as
    1.78 -# opposed to plaintext ones.
    1.79 -#(xend-tcp-xmlrpc-server-ssl-key-file  /etc/xen/xmlrpc.key)
    1.80 -#(xend-tcp-xmlrpc-server-ssl-cert-file /etc/xen/xmlrpc.crt)
    1.81 -
    1.82 -
    1.83 -# Port xend should use for the HTTP interface, if xend-http-server is set.
    1.84 -#(xend-port            8000)
    1.85 -
    1.86 -# Port xend should use for the relocation interface, if xend-relocation-server
    1.87 -# is set.
    1.88 -#(xend-relocation-port 8002)
    1.89 -
    1.90 -# Address xend should listen on for HTTP connections, if xend-http-server is
    1.91 -# set.
    1.92 -# Specifying 'localhost' prevents remote connections.
    1.93 -# Specifying the empty string '' (the default) allows all connections.
    1.94 -#(xend-address '')
    1.95 -#(xend-address localhost)
    1.96 -
    1.97 -# Address xend should listen on for relocation-socket connections, if
    1.98 -# xend-relocation-server is set.
    1.99 -# Meaning and default as for xend-address above.
   1.100 -#(xend-relocation-address '')
   1.101 -
   1.102 -# The hosts allowed to talk to the relocation port.  If this is empty (the
   1.103 -# default), then all connections are allowed (assuming that the connection
   1.104 -# arrives on a port and interface on which we are listening; see
   1.105 -# xend-relocation-port and xend-relocation-address above).  Otherwise, this
   1.106 -# should be a space-separated sequence of regular expressions.  Any host with
   1.107 -# a fully-qualified domain name or an IP address that matches one of these
   1.108 -# regular expressions will be accepted.
   1.109 -#
   1.110 -# For example:
   1.111 -#  (xend-relocation-hosts-allow '^localhost$ ^.*\\.example\\.org$')
   1.112 -#
   1.113 -#(xend-relocation-hosts-allow '')
   1.114 -(xend-relocation-hosts-allow '^localhost$ ^localhost\\.localdomain$')
   1.115 -
   1.116 -# The limit (in kilobytes) on the size of the console buffer
   1.117 -#(console-limit 1024)
   1.118 -
   1.119 -##
   1.120 -# To bridge network traffic, like this:
   1.121 -#
   1.122 -# dom0: ----------------- bridge -> real eth0 -> the network
   1.123 -#                            |
   1.124 -# domU: fake eth0 -> vifN.0 -+
   1.125 -#
   1.126 -# use
   1.127 -#
   1.128 -# (network-script network-bridge)
   1.129 -#
   1.130 -# Your default ethernet device is used as the outgoing interface, by default. 
   1.131 -# To use a different one (e.g. eth1) use
   1.132 -#
   1.133 -# (network-script 'network-bridge netdev=eth1')
   1.134 -#
   1.135 -# The bridge is named xenbr0, by default.  To rename the bridge, use
   1.136 -#
   1.137 -# (network-script 'network-bridge bridge=<name>')
   1.138 -#
   1.139 -# It is possible to use the network-bridge script in more complicated
   1.140 -# scenarios, such as having two outgoing interfaces, with two bridges, and
   1.141 -# two fake interfaces per guest domain.  To do things like this, write
   1.142 -# yourself a wrapper script, and call network-bridge from it, as appropriate.
   1.143 -#
   1.144 -(network-script network-bridge)
   1.145 -
   1.146 -# The script used to control virtual interfaces.  This can be overridden on a
   1.147 -# per-vif basis when creating a domain or a configuring a new vif.  The
   1.148 -# vif-bridge script is designed for use with the network-bridge script, or
   1.149 -# similar configurations.
   1.150 -#
   1.151 -# If you have overridden the bridge name using
   1.152 -# (network-script 'network-bridge bridge=<name>') then you may wish to do the
   1.153 -# same here.  The bridge name can also be set when creating a domain or
   1.154 -# configuring a new vif, but a value specified here would act as a default.
   1.155 -#
   1.156 -# If you are using only one bridge, the vif-bridge script will discover that,
   1.157 -# so there is no need to specify it explicitly.
   1.158 -#
   1.159 -(vif-script vif-bridge)
   1.160 -
   1.161 -
   1.162 -## Use the following if network traffic is routed, as an alternative to the
   1.163 -# settings for bridged networking given above.
   1.164 -#(network-script network-route)
   1.165 -#(vif-script     vif-route)
   1.166 -
   1.167 -
   1.168 -## Use the following if network traffic is routed with NAT, as an alternative
   1.169 -# to the settings for bridged networking given above.
   1.170 -#(network-script network-nat)
   1.171 -#(vif-script     vif-nat)
   1.172 -
   1.173 -# dom0-min-mem is the lowest permissible memory level (in MB) for dom0.
   1.174 -# This is a minimum both for auto-ballooning (as enabled by
   1.175 -# enable-dom0-ballooning below) and for xm mem-set when applied to dom0.
   1.176 -(dom0-min-mem 196)
   1.177 -
   1.178 -# Whether to enable auto-ballooning of dom0 to allow domUs to be created.
   1.179 -# If enable-dom0-ballooning = no, dom0 will never balloon out.
   1.180 -(enable-dom0-ballooning yes)
   1.181 -
   1.182 -# In SMP system, dom0 will use dom0-cpus # of CPUS
   1.183 -# If dom0-cpus = 0, dom0 will take all cpus available
   1.184 -(dom0-cpus 0)
   1.185 -
   1.186 -# Whether to enable core-dumps when domains crash.
   1.187 -#(enable-dump no)
   1.188 -
   1.189 -# The tool used for initiating virtual TPM migration
   1.190 -#(external-migration-tool '')
   1.191 -
   1.192 -# The interface for VNC servers to listen on. Defaults
   1.193 -# to 127.0.0.1  To restore old 'listen everywhere' behaviour
   1.194 -# set this to 0.0.0.0
   1.195 -#(vnc-listen '127.0.0.1')
   1.196 -
   1.197 -# The default password for VNC console on HVM domain.
   1.198 -# Empty string is no authentication.
   1.199 -(vncpasswd '')
     2.1 --- a/tools/examples/xm-config-xenapi.xml	Fri May 23 09:35:57 2008 +0100
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,43 +0,0 @@
     2.4 -<!--
     2.5 -
     2.6 -Copyright (C) 2006 XenSource Inc.
     2.7 -
     2.8 -This library is free software; you can redistribute it and/or
     2.9 -modify it under the terms of version 2.1 of the GNU Lesser General Public
    2.10 -License as published by the Free Software Foundation.
    2.11 -
    2.12 -This library is distributed in the hope that it will be useful,
    2.13 -but WITHOUT ANY WARRANTY; without even the implied warranty of
    2.14 -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    2.15 -Lesser General Public License for more details.
    2.16 -
    2.17 -You should have received a copy of the GNU Lesser General Public
    2.18 -License along with this library; if not, write to the Free Software
    2.19 -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    2.20 -
    2.21 --->
    2.22 -
    2.23 -<!--
    2.24 -
    2.25 -This is a configuration file for xm; it should be placed in
    2.26 -/etc/xen/xm-config.xml.  If this file is missing, then xm will fall back to
    2.27 -the normal behaviour that's in Xen 3.0.4 and below.  The settings here are
    2.28 -most useful for experimenting with the Xen-API preview in Xen 3.0.4.
    2.29 -
    2.30 --->
    2.31 -
    2.32 -<xm>
    2.33 -  <!-- The server element describes how to talk to Xend.  The type may be 
    2.34 -       Xen-API or LegacyXMLRPC (the default).  The URI is that of the
    2.35 -       server; you might try http://server:9363/ or
    2.36 -       httpu:///var/run/xend/xen-api.sock for the Xen-API, or
    2.37 -       httpu:///var/run/xend/xmlrpc.sock for the legacy server.
    2.38 -
    2.39 -       The username and password attributes will be used to log in if Xen-API
    2.40 -       is being used.
    2.41 -    -->
    2.42 -  <server type='Xen-API'
    2.43 -          uri='http://localhost:9363/'
    2.44 -          username='me'
    2.45 -          password='mypassword' />
    2.46 -</xm>