diff options
| -rw-r--r-- | cobbler/remote.py | 4 | ||||
| -rw-r--r-- | scripts/install_trigger.cgi | 16 | ||||
| -rw-r--r-- | triggers/status_post.trigger | 5 | ||||
| -rw-r--r-- | triggers/status_pre.trigger | 5 |
4 files changed, 11 insertions, 19 deletions
diff --git a/cobbler/remote.py b/cobbler/remote.py index b606bbc..0cbaf22 100644 --- a/cobbler/remote.py +++ b/cobbler/remote.py @@ -230,7 +230,7 @@ class CobblerXMLRPCInterface: systems.add(obj,save=True,with_triggers=False,with_sync=False,quick_pxe_update=True) return True - def run_install_triggers(self,mode,objtype,name,mac,ip,token=None): + def run_install_triggers(self,mode,objtype,name,ip,token=None): """ This is a feature used to run the pre/post install triggers. @@ -249,7 +249,7 @@ class CobblerXMLRPCInterface: # time if reinstalling all of a cluster all at once. # we can do that at "cobbler check" time. - utils.run_triggers(None, "/var/lib/cobbler/triggers/install/%s/*" % mode, additional=[objtype,name,mac,ip]) + utils.run_triggers(None, "/var/lib/cobbler/triggers/install/%s/*" % mode, additional=[objtype,name,ip]) return True diff --git a/scripts/install_trigger.cgi b/scripts/install_trigger.cgi index abe5cf6..b83ff57 100644 --- a/scripts/install_trigger.cgi +++ b/scripts/install_trigger.cgi @@ -41,12 +41,6 @@ def parse_query(): form = cgi.parse() - mac = "?" - - if os.environ.has_key("HTTP_X_RHN_PROVISIONING_MAC_0"): - devicepair = os.environ["HTTP_X_RHN_PROVISIONING_MAC_0"] - mac = devicepair.split()[1].strip() - ip = "?" if os.environ.has_key("REMOTE_ADDR"): ip = os.environ["REMOTE_ADDR"] @@ -64,15 +58,15 @@ def parse_query(): if form.has_key("mode"): mode = form["mode"][0] - return (mode,objtype,name,mac,ip) + return (mode,objtype,name,ip) -def invoke(mode,objtype,name,mac,ip): +def invoke(mode,objtype,name,ip): """ Determine if this feature is enabled. """ xmlrpc_server = ServerProxy(XMLRPC_SERVER) - print xmlrpc_server.run_install_triggers(mode,objtype,name,mac,ip) + print xmlrpc_server.run_install_triggers(mode,objtype,name,ip) return True @@ -87,7 +81,7 @@ def header(): if __name__ == "__main__": cgitb.enable(format='text') header() - (mode,objtype,name,mac,ip) = parse_query() - invoke(mode,objtype,name,mac,ip) + (mode,objtype,name,ip) = parse_query() + invoke(mode,objtype,name,ip) diff --git a/triggers/status_post.trigger b/triggers/status_post.trigger index 32934c8..753cceb 100644 --- a/triggers/status_post.trigger +++ b/triggers/status_post.trigger @@ -6,11 +6,10 @@ import time objtype = sys.argv[1] # "system" or "profile" name = sys.argv[2] # name of system or profile -mac = sys.argv[3] # mac or "?" -ip = sys.argv[4] # ip or "?" +ip = sys.argv[3] # ip or "?" fd = open("/var/log/cobbler/install.log","a+") -fd.write("%s\t%s\t%s\t%s\tstop\t%s\n" % (objtype,name,mac,ip,time.time())) +fd.write("%s\t%s\t%s\t%s\tstop\t%s\n" % (objtype,name,ip,time.time())) fd.close() sys.exit(0) diff --git a/triggers/status_pre.trigger b/triggers/status_pre.trigger index 385beaa..8d6f6b6 100644 --- a/triggers/status_pre.trigger +++ b/triggers/status_pre.trigger @@ -6,11 +6,10 @@ import time objtype = sys.argv[1] # "system" or "profile" name = sys.argv[2] # name of system or profile -mac = sys.argv[3] # mac or "?" -ip = sys.argv[4] # ip or "?" +ip = sys.argv[3] # ip or "?" fd = open("/var/log/cobbler/install.log","a+") -fd.write("%s\t%s\t%s\t%s\tstart\t%s\n" % (objtype,name,mac,ip,time.time())) +fd.write("%s\t%s\t%s\t%s\tstart\t%s\n" % (objtype,name,ip,time.time())) fd.close() sys.exit(0) |