Permalink
Browse files

resolved issues after merging

  • Loading branch information...
iiman committed Aug 13, 2013
1 parent bd61383 commit d4854ede490c4dfc1fe752bf31660b3d8b75aaba
@@ -312,7 +312,7 @@ def _post_to_sweep(self, bundle):
return (platform, directive_name, directive_args, system_settings)
def _post_to_remotemake(self, bundle):
platform = 'local'
platform = 'nci'
directive_name = "remotemake"
logger.debug("%s" % directive_name)
directive_args = []

This file was deleted.

Oops, something went wrong.
View
@@ -0,0 +1,50 @@
#Generated from Chef, do not modify
from bdphpcprovider.settings_changeme import *
Debug=True
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': 'bdphpc',
'USER': 'bdphpc',
'PASSWORD': 'bdphpc', # unused with ident auth
'HOST': '',
'PORT': '',
}
}
LOGGING = {
'version': 1,
'disable_existing_loggers': False,
'formatters': {
'timestamped': {
'format': '%(asctime)s-%(filename)s-%(lineno)s-%(levelname)s: %(message)s'
},
},
'handlers': {
'file': {
'level':'DEBUG',
'class': 'logging.FileHandler',
'filename': '/var/log/cloudenabling/bdphpcprovider.log',
'formatter': 'timestamped'
},
},
'loggers': {
'bdphpcprovider.smartconnectorscheduler': {
'handlers': ['file'],
'level': 'DEBUG',
},
'bdphpcprovider.simpleui': {
'handlers': ['file'],
'level': 'DEBUG',
},
'bdphpcprovider.core': {
'handlers': ['file'],
'level': 'DEBUG',
},
},
}
@@ -35,7 +35,7 @@
<li><a href="{% url hrmcjob-list %}">Retrieve Jobs</a></li>
<li><a href="{% url hrmcjob-new %}">Create HRMC Job</a></li>
<li><a href="{% url sweepjob-new %}">Create SWEEP Job</a></li>
<li><a href="{% url makejob-new %}">Create RemoteMake Job</a></li>
<li><a href="{% url userprofileparameter-list %}">User Settings</a></li>
<li><a href="{% url listdir-list %}">Directory</a></li>
<li><a href="{% url copyjob-new %}">Copy Data</a></li>
@@ -374,6 +374,7 @@ def form_valid(self, form):
logger.debug("r.json=%s" % r.json)
logger.debug("r.text=%s" % r.text)
logger.debug("r.headers=%s" % r.headers)
logger.debug("data=%s" % data)
header_location = r.headers['location']
logger.debug("header_location=%s" % header_location)
new_context_uri = header_location[len(api_host):]
@@ -753,18 +753,20 @@ def define_remote_make(self, nci_platform):
remote_make_stage, _ = models.Stage.objects.get_or_create(
name="make",
description="Makefile execution stage",
package=self.remotemake_stage,
package=self.remote_make_stage,
parent=remote_make_composite_stage,
order=2)
remote_make_stage.update_settings({})
# executes make with finished target and repeats until finished.
make_finished_stage = models.Stage.objects.get_or_create(
make_finished_stage, _ = models.Stage.objects.get_or_create(
name="makefinished",
description="Makefile execution stage",
package=self.make_finished_stage,
parent=remote_make_composite_stage,
order=3)
logger.debug('make_finished_stage=%s' % str(make_finished_stage))
make_finished_stage.update_settings({})
# # copies input files + makefile to remote system
View
@@ -1 +1 @@
{'foo': 'bar'}
{"foo": "bar"}

0 comments on commit d4854ed

Please sign in to comment.