← Back to branch summary

~ahasenack/landscape-client/landscape-client-11.02-0ubuntu0.9.10.0

« back to all changes in this revision

Viewing changes to landscape/broker/deployment.py

  • Committer: Bazaar Package Importer
  • Author(s): Free Ekanayaka
  • Date: 2010-02-10 18:49:25 UTC
  • mfrom: (1.2.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20100210184925-di1svw11f8d8oexz
Tags: 1.4.4-0ubuntu0.9.10
https://launchpad.net/bugs/519200
https://launchpad.net/bugs/514334
https://launchpad.net/bugs/517175
https://launchpad.net/bugs/509752
https://launchpad.net/bugs/518501
https://launchpad.net/bugs/218388
https://launchpad.net/bugs/517454
https://launchpad.net/bugs/517453
* New upstream release (LP: #519200):
  - Add a message for creating package locks (LP: #514334)
  - Add support for auto-approved change-packages messages (LP: #517175)
  - Add support for installing server-generated debian packages (LP: #509752)
  - Add support for reporting Eucalyptus topology information (LP: #518501)
  - Fix timeout while inserting large free-space message (LP: #218388)
  - Fix wrong log path in motd (LP: #517454)
  - Fix race condition in process excecution (LP: #517453)

Show diffs side-by-side

added added

removed removed

Lines of Context:
landscape/broker/deployment.py
53
53
        parser.add_option("-t", "--computer-title", metavar="TITLE",
54
54
                          help="The title of this computer")
55
55
        parser.add_option("-u", "--url",
56
 
                          help="The server URL to connect to.")
 
56
                          help="The server URL to connect to (default: "
 
57
                               "https://landscape.canonical.com/"
 
58
                               "message-system).")
57
59
        parser.add_option("-k", "--ssl-public-key",
58
 
                          help="The public SSL key to verify the server. "
59
 
                               "Only used if the given URL is https.")
 
60
                          help="The SSL CA certificate to verify the server "
 
61
                               "with. Only used if the server URL to which "
 
62
                               "we connect is https.")
60
63
        parser.add_option("--exchange-interval", default=15*60, type="int",
61
64
                          metavar="INTERVAL",
62
65
                          help="The number of seconds between server "
63
 
                               "exchanges.")
 
66
                               "exchanges (default: 900s).")
64
67
        parser.add_option("--urgent-exchange-interval", default=1*60,
65
68
                          type="int", metavar="INTERVAL",
66
69
                          help="The number of seconds between urgent server "
67
 
                               "exchanges.")
 
70
                               "exchanges (default: 60s).")
68
71
        parser.add_option("--ping-url",
69
72
                          help="The URL to perform lightweight exchange "
70
 
                               "initiation with.")
 
73
                               "initiation with (default: "
 
74
                               "http://landscape.canonical.com/ping).")
71
75
        parser.add_option("--http-proxy", metavar="URL",
72
76
                          help="The URL of the HTTP proxy, if one is needed.")
73
77
        parser.add_option("--https-proxy", metavar="URL",
74
78
                          help="The URL of the HTTPS proxy, if one is needed.")
75
79
        parser.add_option("--cloud", action="store_true",
76
 
                          help="Set this if your computer is in an EC2 cloud.")
 
80
                          help="Set this if your computer is a cloud instance "
 
81
                               "(EC2 or UEC) and you want it to be managed by "
 
82
                               "Landscape's cloud features. See the manpage "
 
83
                               "for details.")
 
84
        parser.add_option("--tags",
 
85
                          help="Comma separated list of tag names to be sent "
 
86
                               "to the server.")
77
87
        return parser
78
88
 
79
89
    @property