Changeset 1653:f58aeda2a341

Timestamp:

06/11/08 16:51:53 (2 months ago)

Author:

klai@…

Branch:

default

Message:

Use /etc/tycoon/defaults for storing defaults configuration information

Files:

• MANIFEST.in (modified) (1 diff)
• etc/tycoon/bank_public_key (moved) (moved from src/bank_public_key)
• etc/tycoon/defaults/tycoon.conf (moved) (moved from src/tycoon.conf) (1 diff)
• etc/tycoon/tycoon.conf (added)
• packaging/fedora_core_3/tycoon_aucd/etc/tycoon/defaults/tycoon_aucd.conf (copied) (copied from packaging/fedora_core_3/tycoon_aucd/etc/tycoon/tycoon_aucd.conf) (1 diff)
• packaging/fedora_core_3/tycoon_aucd/etc/tycoon/tycoon_aucd.conf (modified) (1 diff)
• packaging/fedora_core_3/tycoon_aucd/setup.py.template (modified) (3 diffs)
• setup.py.template (modified) (3 diffs)
• src/Tycoon/Auctioneer.py (modified) (1 diff)
• src/Tycoon/CmdLineAuctioneer.py (modified) (3 diffs)
• src/Tycoon/ServiceLocationService.py (modified) (1 diff)
• src/Tycoon/Ssh.py (modified) (1 diff)
• src/Tycoon/Tycoon.py (modified) (1 diff)
• src/test_app.conf (deleted)
• src/test_process.conf (deleted)
• src/tycoon_aucd_local.conf.in (deleted)
• src/tycoon_child_agent.conf (deleted)
• src/tycoon_dist_auc.conf (deleted)
• src/tycoon_dist_auc.conf.user (deleted)
• src/tycoon_parent_agent.conf (deleted)
• src/tycoon_sl.repo (added)

MANIFEST.in

@@ -1 +1 @@
 include src/scripts/*
-include src/tycoon.conf
 include src/tycoon*.repo
-include src/bank_public_key
-include src/tycoon_aucd_local.conf.in
-include src/tycoon_dist_auc.conf
-include src/tycoon_dist_auc.conf.user
+include etc/*
 
 

etc/tycoon/defaults/tycoon.conf

@@ -2 +2 @@
 # Warning: do not modify this file. Modifications will be overwritten
 # when the tycoon packages are upgraded. Instead, put configuration changes
-# in /etc/tycoon/tycoon_aucd_local.conf (for the auctioneer) or 
+# in /etc/tycoon/tycoon_aucd.conf (for the auctioneer), 
+# /etc/tycoon/tycoon.conf (for all users on the host), or 
 # ~/.tycoon/tycoon.conf (for individual users). Values set in those files 
 # will supercede the values in this file.

packaging/fedora_core_3/tycoon_aucd/etc/tycoon/defaults/tycoon_aucd.conf

@@ -2 +2 @@
 # Warning: do not modify this file. Modifications will be overwritten
 # when the tycoon packages are upgraded. Instead, put configuration changes
-# in /etc/tycoon/tycoon_aucd_local.conf (for the auctioneer) or 
+# in /etc/tycoon/tycoon_aucd.conf (for the auctioneer), 
+# /etc/tycoon/tycoon.conf (for all users on the host), or 
 # ~/.tycoon/tycoon.conf (for individual users). Values set in those files 
 # will supercede the values in this file.

packaging/fedora_core_3/tycoon_aucd/etc/tycoon/tycoon_aucd.conf

@@ -1 +1 @@
 #! /usr/bin/env python
-# Warning: do not modify this file. Modifications will be overwritten
-# when the tycoon packages are upgraded. Instead, put configuration changes
-# in /etc/tycoon/tycoon_aucd_local.conf (for the auctioneer) or 
-# ~/.tycoon/tycoon.conf (for individual users). Values set in those files 
-# will supercede the values in this file.
-
-# The file to log to or None for stderr
-LoggingFileName = "/var/log/tycoon_aucd.log"
-
-# The location of the user's bank private key
-PrivateKeyFileName = "/etc/tycoon/%(BankAccountName)s_bank_private_key"
-SecondPassOptions['PrivateKeyFileName'] = True
-
-# The location of the user's bank public key
-PublicKeyFileName = "/etc/tycoon/%(BankAccountName)s_bank_public_key"
-SecondPassOptions['PublicKeyFileName'] = True
-
-# The location of the user's bank private key
-AdminPublicKeyFileName = "/etc/tycoon/admin_public_key"
-
-# Whether to run as a daemon
-Daemonize = True
-
-# The location of the account database
-TycoonDirectory = "/var/lib/tycoon"
-Directory = "aucd"
-PrivateDirectory = "private"
-AccountDatabaseFileName = "accounts.db"
-DatabaseFileName = "data.db"
-
-BankReplayDetectionBufferFileName = "/var/lib/tycoon/aucd/private/bank_replay_detection_buffer"
-AccountReplayDetectionBufferFileName = "replay_detection_buffer"
-
-# The location of virtual machine monitor data
-# The full path is Directory + VMMDirectory
-VMMDirectory = "%(Virtualization)s"
-SecondPassOptions['VMMDirectory'] = True
-
-VMMPrivateDirectory = "private"
-
-# The location of virtual machine monitor libraries
-# The full path is VMMDirectory + VMMLibraryDirectory
-VMMLibraryDirectory = "lib"
-
-VMMAccountsDirectory = "accounts"
-
-# The name of the virtual machine monitor's account database.
-# The full path is VMMLibraryDirectory + VMMAccountDatabaseFileName
-VMMAccountDatabaseFileName = "accounts.db"
-
-# The TCPv4 ports to exclude from dynamic allocation
-VMMTCPv4ExcludedPorts = []
-
-# The name fields used for generation of a host key.
-HostKeyNameFields = {
-    "C": "US", "ST": "California", "L": "Palo Alto", "O": "Hewlett-Packard",
-    "OU": "HP Labs"}
-
-# The file containing the x509 private key for this host 
-SSLPrivateKeyFileName = "private_key.pem"
-
-# The file containing the x509 certificate for this host
-SSLCertificateFileName = "certificate.pem"
-
-# The files containing the x509 certificates for the certificate authorities
-AuthorityCertificateFileNames = ("keys/ca_certificate.pem",)
-
-# The ssh port number used to log into this machine.
-SSHPortNumber = 22
-
-# The allowable file system URLS
-AllowedFileSystemImageRegexs = (
-    "http://tycoon.hpl.hp.com/~tycoon/dl/images/.+",
-    "file:///var/lib/tycoon/aucd/Xen303/lib/.+",
-    )
-
-# The default file system image
-DefaultFileSystemImage = "http://tycoon.hpl.hp.com/~tycoon/dl/images/centos.5-0.ext3.bz2"
-
-# The files to copy into the new file systems.
-FileSystemFiles = (
-    ("/etc", ("/etc/resolv.conf", )),
-    )
-
-# The interval for allocation and accounting
-AccountingInterval = 60.0
-
-AllocationAlgorithm = "Proportional Share"
-
-# The characteristics of resources. The fields are as follows:
-#   max allocated: the maximum amount that will be allocated
-#                  None indicates that all of it should be allocated
-#   reserved: the amount within the allocated that will be reserved for
-#             system operations. None indicates a resource-specific
-#             algorithm should be used.
-#   info: resource-specific information
-Resources = {
-    'CPU': {0: {'reserved': "1 GHz"}},
-    'memory': {0: {}},
-    'disk': {0: {'reserved': "4 GiB"}},
-    'NetworkInterfaceIncoming': {
-    0: {'capacity': "1 Gbit/s", 'reserved': "32 kbit/s"}},
-    'NetworkInterfaceOutgoing': {
-    0: {'capacity': "1 Gbit/s", 'reserved': "32 kbit/s"}},
-    'TCPv4Port': {
-    (1, 21): {'capacity': 1},
-    (23, AuctioneerPortNumber - 1): {'capacity': 1},
-    (AuctioneerPortNumber + 1, 2**16 - 1): {'capacity': 1},
-    # ssh
-    22: {'capacity': 1, 'reserved': 1},
-    # The auctioneer itself
-    AuctioneerPortNumber: {'capacity': 1, 'reserved': 1},
-    },
-    'IPv4Address': {
-    # This is only an example
-    #("10.0.0.3", "10.0.0.10"): {
-    #'capacity': 1, 'default_lease_time': 300, 'max_lease_time': 300,
-    #'routers': "10.0.0.1", 'subnet_mask': "255.255.255.0",
-    #'broadcast_address': "10.0.0.255",  'name_servers': ("10.0.0.2",)}
-    }
-}
-
-# Extra fields to register with the service location service
-SLSRegistrationFields = (
-    # Information about the machine's owner
-    # These are only examples. Put the real ones in /etc/tycoon_aucd_local.conf
-    #("OwnerURL", "http://tycoon.hpl.hp.com"),
-    #("OwnerIcon", "http://tycoon.hpl.hp.com/~tycoon/dl/pictures/HPL-48x48.png"),
-)
-
-# Use this to prevent auctioneers behind firewalls from being discovered
-# by users who cannot access them. The structure is as follows:
-# [ (network_address, netmask),
-# ]
-# where only clients on the subnet (network_address & netmask) can access
-# this auctioneer.
-NetworkAccessibility = [(0, 0)]
+# This file is for custom configuration that applies to all users and tycoon 
+# applications on this host. The variables set in this file supercede those 
+# in /etc/tycoon/defaults/tycoon_aucd.conf

packaging/fedora_core_3/tycoon_aucd/setup.py.template

@@ -12 +12 @@
     def _make_spec_file(self):
         self.config_files = [
+            '/etc/tycoon/defaults/tycoon_aucd.conf', 
             '/etc/tycoon/tycoon_aucd.conf', 
             '/etc/logrotate.d/tycoon_aucd',
@@ -21 +22 @@
                 f.append("%%config %s" % (cf,))
 
-        f.append("%%attr(444, root, root) /etc/tycoon/tycoon_aucd.conf")
+        f.append(
+            "%%attr(444, root, root) /etc/tycoon/defaults/tycoon_aucd.conf")
         return f
 
@@ -53 +55 @@
     scripts          = ['usr/bin/tycoon_aucd'],
     data_files       = [
+    ('/etc/tycoon/defaults/tycoon', ['etc/tycoon/defaults/tycoon_aucd.conf',]),
     ('/etc/tycoon', ['etc/tycoon/tycoon_aucd.conf',]),
     ('/etc/logrotate.d', ['etc/logrotate.d/tycoon_aucd',]),

setup.py.template

@@ -12 +12 @@
     def _make_spec_file(self):
         self.config_files = [
-            '/etc/tycoon/tycoon.conf', '/etc/tycoon/tycoon_dist_auc.conf',
-            '/etc/tycoon/tycoon_aucd_local.conf.in', 
-            '/etc/tycoon/tycoon_dist_auc.conf.user',
+            '/etc/tycoon/tycoon.conf', 
             '/etc/tycoon/bank_public_key',
+            '/etc/tycoon/defaults/tycoon.conf', 
             '/etc/yum.repos.d/tycoon_$distribution_code$.repo',
             ]
@@ -22 +21 @@
             for cf in self.config_files:
                 f.append("%%config %s" % (cf,))
-        f.append("%%attr(444, root, root) /etc/tycoon/tycoon.conf")
+        f.append("%%attr(444, root, root) /etc/tycoon/defaults/tycoon.conf")
         return f
 
@@ -72 +71 @@
     ],
     data_files       = [
-    ('/etc/tycoon', [
-    'src/tycoon.conf', 'src/tycoon_dist_auc.conf',
-    'src/tycoon_aucd_local.conf.in', 'src/tycoon_dist_auc.conf.user',
-    'src/bank_public_key', 
-    ]),
+    ('/etc/tycoon', ['etc/tycoon/tycoon.conf', 'etc/tycoon/bank_public_key']),
+    ('/etc/tycoon/default', ['etc/tycoon/default/tycoon.conf']),
     ('/etc/yum.repos.d', ['src/tycoon_$distribution_code$.repo']),
     ],

src/Tycoon/Auctioneer.py

@@ -124 +124 @@
         self.__main = Main(
             "tycoon_aucd",
-            ("tycoon.conf", "tycoon_aucd.conf", "tycoon_aucd_vmm.conf",
-             "tycoon_aucd_local.conf"), ("/etc/tycoon",), ol, reactor,
+            ("tycoon.conf", "tycoon_aucd.conf", "tycoon_aucd_vmm.conf"),
+            ("/etc/tycoon/defaults", "/etc/tycoon",), ol, reactor,
             summary, description, (), version=self.__version, usage=usage,)
         

src/Tycoon/CmdLineAuctioneer.py

@@ -195 +195 @@
         # but not user-specific options.
         aucd_options = Options(
-            ("tycoon.conf", "tycoon_aucd.conf", "tycoon_aucd_vmm.conf",
-             "tycoon_aucd_local.conf"), ("/etc/tycoon",), DefaultOptionList)
+            ("tycoon.conf", "tycoon_aucd.conf", "tycoon_aucd_vmm.conf"), 
+            ("/etc/tycoon/defaults", "/etc/tycoon",), DefaultOptionList)
         aucd_options.parse([])
         
@@ -210 +210 @@
         # Pick up owner information from ~root/.tycoon
         owner_options = Options(
-            ("tycoon.conf", ), ("/etc/tycoon", "~root/.tycoon",),
+            ("tycoon.conf", ), 
+            ("/etc/tycoon/defaults", "/etc/tycoon", "~root/.tycoon",),
             DefaultOptionList)
         owner_options.parse([])
@@ -230 +231 @@
         shutil.copyfile(pub_src, admin_key_fn)
 
-        fn = "/etc/tycoon/tycoon_aucd_local.conf"
+        fn = "/etc/tycoon/tycoon_aucd.conf"
         un_found = False
         if os.path.isfile(fn):

src/Tycoon/ServiceLocationService.py

@@ -110 +110 @@
         self.__main = Main(
             "tycoon_sls", ("tycoon.conf", "tycoon_sls.conf"),
-            ("/etc/tycoon", "~/.tycoon"), ol, reactor, summary, description,
-            (), version=version, usage=usage,)
+            ("/etc/tycoon/defaults", "/etc/tycoon"), ol, reactor, summary, 
+            description, (), version=version, usage=usage,)
 
         self.__options = self.__main.options

src/Tycoon/Ssh.py

@@ -98 +98 @@
         self.__main = Main(
             "tycoon", ("tycoon.conf",),
-            ("/etc/tycoon", os.environ.get('TYCOON_CONFIG_PATH','~/.tycoon')), 
+            ("/etc/tycoon/defaults", "/etc/tycoon", 
+             os.environ.get('TYCOON_CONFIG_PATH','~/.tycoon')), 
             ol, reactor, summary, description, (), version = version,
             usage = usage, argv = sys.argv[0:i])

src/Tycoon/Tycoon.py

@@ -91 +91 @@
         self.__main = Main(
             "tycoon", ("tycoon.conf",),
-            ("/etc/tycoon", os.environ.get('TYCOON_CONFIG_PATH','~/.tycoon')),
+            ("/etc/tycoon/defaults", "/etc/tycoon", 
+             os.environ.get('TYCOON_CONFIG_PATH','~/.tycoon')),
             ol, reactor, summary, description, subcommands, version = version,
             usage = usage,)