Added dependiencies.json and added pastafari_tasks support to config_task
This commit is contained in:
parent
2bb28678ef
commit
a26aa723b3
5 changed files with 16 additions and 6 deletions
|
|
@ -61,8 +61,10 @@ if hasattr(config, 'pastafari_base_path'):
|
||||||
|
|
||||||
pastafari_paths=[]
|
pastafari_paths=[]
|
||||||
|
|
||||||
if hasattr(config, 'pastafari_paths'):
|
#if hasattr(config, 'pastafari_paths'):
|
||||||
pastafari_paths=config.pastafari_paths
|
# pastafari_paths=config.pastafari_paths
|
||||||
|
|
||||||
|
pastafari_paths=config_task.pastafari_paths
|
||||||
|
|
||||||
@admin_app.route('/pastafari2/dashboard/')
|
@admin_app.route('/pastafari2/dashboard/')
|
||||||
def pastafari2_dashboard():
|
def pastafari2_dashboard():
|
||||||
|
|
|
||||||
6
dependencies.json
Normal file
6
dependencies.json
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
|
||||||
|
"packages": ["urllib3", "paramiko", "gevent"],
|
||||||
|
"models": ["mtest"]
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -83,6 +83,8 @@ class ConfigTask:
|
||||||
self.ssh_private_key_password=''
|
self.ssh_private_key_password=''
|
||||||
|
|
||||||
self.ssh_public_key=self.ssh_private_key+'.pub'
|
self.ssh_public_key=self.ssh_private_key+'.pub'
|
||||||
|
|
||||||
|
self.pastafari_paths=[]
|
||||||
|
|
||||||
# Class for global configuration
|
# Class for global configuration
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,8 +13,8 @@ try:
|
||||||
except:
|
except:
|
||||||
import json
|
import json
|
||||||
|
|
||||||
from redis import Redis
|
#from redis import Redis
|
||||||
from rq import Queue
|
#from rq import Queue
|
||||||
import importlib
|
import importlib
|
||||||
import traceback
|
import traceback
|
||||||
from modules.pastafari2.models.tasks import Task
|
from modules.pastafari2.models.tasks import Task
|
||||||
|
|
|
||||||
|
|
@ -13,8 +13,8 @@ try:
|
||||||
except:
|
except:
|
||||||
import json
|
import json
|
||||||
|
|
||||||
from redis import Redis
|
#from redis import Redis
|
||||||
from rq import Queue
|
#from rq import Queue
|
||||||
import importlib
|
import importlib
|
||||||
import traceback
|
import traceback
|
||||||
#from modules.monit.models.monit import LonelyIpField
|
#from modules.monit.models.monit import LonelyIpField
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue