diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2007-11-29 17:05:04 -0500 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2007-11-29 17:05:04 -0500 |
| commit | 4547a2759ce5369774676f16365492f14aad2392 (patch) | |
| tree | 85ffd823e2b877ee6b4351f4081dd520d80a1756 /cobbler | |
| parent | 231ef515b22aa0204c625340f492eba651ef4bae (diff) | |
| download | third_party-cobbler-4547a2759ce5369774676f16365492f14aad2392.tar.gz third_party-cobbler-4547a2759ce5369774676f16365492f14aad2392.tar.xz third_party-cobbler-4547a2759ce5369774676f16365492f14aad2392.zip | |
Slight changes to post install triggers patch, namely adding some underscores.
Diffstat (limited to 'cobbler')
| -rw-r--r-- | cobbler/action_sync.py | 4 | ||||
| -rw-r--r-- | cobbler/remote.py | 5 | ||||
| -rw-r--r-- | cobbler/settings.py | 2 | ||||
| -rw-r--r-- | cobbler/webui/master.py | 10 |
4 files changed, 10 insertions, 11 deletions
diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py index c8ab81e..e1d61d8 100644 --- a/cobbler/action_sync.py +++ b/cobbler/action_sync.py @@ -390,7 +390,7 @@ class BootSync: pattern1 = "wget \"http://%s/cblr/watcher.py?%s_%s=%s\" -b" pattern2 = "wget \"http://%s/cgi-bin/cobbler/nopxe.cgi?system=%s\" -b" pattern3 = "wget \"http://%s/cobbler/%s/%s/ks.cfg\" -O /root/cobbler.ks" - pattern4 = "wget \"http://%s/cgi-bin/cobbler/postinstalltrigger.cgi?system=%s\" -b" + pattern4 = "wget \"http://%s/cgi-bin/cobbler/post_install_trigger.cgi?system=%s\" -b" blend_this = profile if system: @@ -406,7 +406,7 @@ class BootSync: buf = buf + "\n" + pattern2 % (blended["server"], system.name) if kickstart and os.path.exists(kickstart): buf = buf + "\n" + pattern3 % (blended["server"], "kickstarts_sys", system.name) - if self.settings.run_postinstall_trigger: + if self.settings.run_post_install_trigger: buf = buf + "\n" + pattern4 % (blended["server"], system.name) else: diff --git a/cobbler/remote.py b/cobbler/remote.py index 5d3f91e..b6e6a04 100644 --- a/cobbler/remote.py +++ b/cobbler/remote.py @@ -145,17 +145,16 @@ class CobblerXMLRPCInterface: systems.add(obj,with_copy=True) return True - def run_postinstalltrigger(self,name,token=None): + def run_post_install_triggers(self,name,token=None): """ This is a feature used to run the post install trigger. It passes the system named "name" to the trigger. Disabled by default as this requires public API access and is technically a read-write operation. """ # used by postinstalltrigger.cgi - self.logger.debug("Starting run_postinstalltrigger") self.api.clear() self.api.deserialize() - if not self.api.settings().run_postinstall_trigger: + if not self.api.settings().run_post_install_trigger: # feature disabled! return False systems = self.api.systems() diff --git a/cobbler/settings.py b/cobbler/settings.py index 43b3e06..8f9527d 100644 --- a/cobbler/settings.py +++ b/cobbler/settings.py @@ -43,7 +43,7 @@ DEFAULTS = { "manage_dhcp_mode" : "isc", "next_server" : "127.0.0.1", "pxe_just_once" : 0, - "run_postinstall_trigger" : 0, + "run_post_install_trigger" : 0, "server" : "127.0.0.1", "snippetsdir" : "/var/lib/cobbler/snippets", "syslog_port" : 25150, diff --git a/cobbler/webui/master.py b/cobbler/webui/master.py index 89cf4a8..5d630c6 100644 --- a/cobbler/webui/master.py +++ b/cobbler/webui/master.py @@ -31,12 +31,12 @@ VFFSL=valueFromFrameOrSearchList VFSL=valueFromSearchList VFN=valueForName currentTime=time.time -__CHEETAH_version__ = '2.0rc8' -__CHEETAH_versionTuple__ = (2, 0, 0, 'candidate', 8) -__CHEETAH_genTime__ = 1196349031.5462351 -__CHEETAH_genTimestamp__ = 'Thu Nov 29 16:10:31 2007' +__CHEETAH_version__ = '2.0' +__CHEETAH_versionTuple__ = (2, 0, 0, 'final', 0) +__CHEETAH_genTime__ = 1196370730.2521651 +__CHEETAH_genTimestamp__ = 'Thu Nov 29 16:12:10 2007' __CHEETAH_src__ = 'webui_templates/master.tmpl' -__CHEETAH_srcLastModified__ = 'Thu Nov 29 14:40:41 2007' +__CHEETAH_srcLastModified__ = 'Wed Nov 7 12:24:52 2007' __CHEETAH_docstring__ = 'Autogenerated by CHEETAH: The Python-Powered Template Engine' if __CHEETAH_versionTuple__ < RequiredCheetahVersionTuple: |