x/solar
Code Issues Proposed changes

Fix imports for s/x/solar.core/

Browse Source
This commit is contained in:
Evgeniy L 2015-05-14 10:53:43 +02:00
parent d00d9b8db0
commit c7b21abeca
7 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
example.py
View File

@ -1,8 +1,8 @@
import shutil import shutil
import os import os
from x import resource from solar.core import resource
from x import signals from solar.core import signals
signals.Connections.clear() signals.Connections.clear()
@ -71,7 +71,7 @@ signals.connect(haproxy_config, haproxy_service, {'listen_ports':'ports', 'confi
#run #run
from x import actions from solar.core import actions
actions.resource_action(mariadb_service1, 'run') actions.resource_action(mariadb_service1, 'run')
actions.resource_action(keystone_db, 'run') actions.resource_action(keystone_db, 'run')

8
solar/solar/core/handlers/__init__.py
View File

@ -1,7 +1,7 @@
# -*- coding: UTF-8 -*- # -*- coding: utf-8 -*-
from x.handlers.ansible import Ansible from solar.core.handlers.ansible import Ansible
from x.handlers.base import Empty from solar.core.handlers.base import Empty
from x.handlers.shell import Shell from solar.core.handlers.shell import Shell
HANDLERS = {'ansible': Ansible, HANDLERS = {'ansible': Ansible,

4
solar/solar/core/handlers/ansible.py
View File

@ -1,9 +1,9 @@
# -*- coding: UTF-8 -*- # -*- coding: utf-8 -*-
import os import os
import subprocess import subprocess
import yaml import yaml
from x.handlers.base import BaseHandler from solar.core.handlers.base import BaseHandler
class Ansible(BaseHandler): class Ansible(BaseHandler):

4
solar/solar/core/handlers/shell.py
View File

@ -1,7 +1,7 @@
# -*- coding: UTF-8 -*- # -*- coding: utf-8 -*-
import subprocess import subprocess
from x.handlers.base import BaseHandler from solar.core.handlers.base import BaseHandler
class Shell(BaseHandler): class Shell(BaseHandler):

2
solar/solar/core/observer.py
View File

@ -1,4 +1,4 @@
from x import signals from solar.core import signals
class BaseObserver(object): class BaseObserver(object):

12
solar/solar/core/resource.py
View File

@ -1,4 +1,4 @@
# -*- coding: UTF-8 -*- # -*- coding: utf-8 -*-
import copy import copy
import json import json
import os import os
@ -6,11 +6,11 @@ import shutil
import yaml import yaml
from x import actions from solar.core import actions
from x import db from solar.core import db
from x import observer from solar.core import observer
from x import signals from solar.core import signals
from x import utils from solar.core import utils
class Resource(object): class Resource(object):

2
solar/solar/core/signals.py
View File

@ -6,7 +6,7 @@ import os
import db import db
from x import utils from solar.core import utils
CLIENTS_CONFIG_KEY = 'clients-data-file' CLIENTS_CONFIG_KEY = 'clients-data-file'