x/compass-core
Code Issues Proposed changes

merge all changes from private git 12.234.32.41 to public git compass-core. Fix all broken tests caused by the code change.

Browse Source 
Change-Id: I6b629d5cdb4ddf3a1a3eedb08fae37501e51ed09
This commit is contained in:
Xiaodong Wang
2014-01-24 22:01:36 -08:00
committed by xiaodongwang
parent 97698042df
commit 16ebf00865
25 changed files with 1957 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
conf/setting
View File

@@ -5,14 +5,14 @@ HOST_CONFIG_PROVIDER = 'db'
CONFIG_DIR = '/etc/compass'
GLOBAL_CONFIG_FILENAME = 'global_config'
CONFIG_FILE_FORMAT = 'python'
DATABASE_TYPE = 'sqlite'
DATABASE_TYPE = 'file'
DATABASE_FILE = '/opt/compass/db/app.db'
SQLALCHEMY_DATABASE_URI = DATABASE_TYPE + ':///' + DATABASE_FILE
SQLALCHEMY_DATABASE_URI = 'sqlite:///' + DATABASE_FILE
OS_INSTALLER = 'cobbler'
COBBLER_INSTALLER_URL = 'http://192.168.1.201/cobbler_api'
COBBLER_INSTALLER_URL = 'http://localhost/cobbler_api'
COBBLER_INSTALLER_TOKEN = ['cobbler', 'cobbler']
PACKAGE_INSTALLER = 'chef'
CHEF_INSTALLER_URL = 'https://192.168.1.201'
CHEF_INSTALLER_URL = 'https://localhost'
CHEF_GLOBAL_DATABAG_NAME = 'env_default'
INSTALLATION_LOGDIR = '/var/log/cobbler/anamon'
DEFAULT_LOGLEVEL = 'debug'
@@ -26,3 +26,5 @@ CELERYCONFIG_DIR = '/etc/compass'
CELERYCONFIG_FILE = 'celeryconfig'
PROGRESS_UPDATE_INTERVAL=30
POLLSWITCH_INTERVAL=60
SWITCHES = [
]