x/compass-core
Code Issues Proposed changes

Merge "update compass-core code when log location chagned" into dev/experimental

Browse Source
This commit is contained in:
Jenkins
2014-09-23 00:15:04 +00:00
committed by Gerrit Code Review
parent 5b969f98cd e6ea75052f
commit d4cec746e6
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compass/db/api/host.py
View File

@@ -219,7 +219,7 @@ def is_host_editable(
reinstall_os_set=False, exception_when_not_editable=True
):
if reinstall_os_set:
if host.state.state == 'DEPLOYING':
if host.state.state == 'INSTALLING':
return _conditional_exception(
host, exception_when_not_editable
)

6
compass/utils/setting_wrapper.py
View File

@@ -29,10 +29,10 @@ SQLALCHEMY_DATABASE_URI = 'sqlite://'
SQLALCHEMY_DATABASE_POOL_TYPE = 'static'
INSTALLATION_LOGDIR = {
'CobblerInstaller': '/var/log/cobbler/anamon',
'ChefInstaller': '/var/log/cobbler/anamon'
'ChefInstaller': '/var/log/chef'
}
CLUSTERHOST_INATALLATION_LOGDIR_NAME = 'hostname'
HOST_INSTALLATION_LOGDIR_NAME = 'hostname'
CLUSTERHOST_INATALLATION_LOGDIR_NAME = 'name'
HOST_INSTALLATION_LOGDIR_NAME = 'name'
DEFAULT_LOGLEVEL = 'debug'
DEFAULT_LOGDIR = '/tmp'
DEFAULT_LOGINTERVAL = 1

2
conf/setting
View File

@@ -8,7 +8,7 @@ SQLALCHEMY_DATABASE_URI = '%s://%s:%s@%s/%s' % (DATABASE_TYPE, DATABASE_USER, DA
SQLALCHEMY_DATABASE_POOL_TYPE = 'instant'
INSTALLATION_LOGDIR = {
'CobblerInstaller': '/var/log/cobbler/anamon',
'ChefInstaller': '/var/log/cobbler/anamon'
'ChefInstaller': '/var/log/chef'
}
DEFAULT_LOGLEVEL = 'debug'
DEFAULT_LOGDIR = '/var/log/compass'

6
misc/rsyslog/rsyslog.conf
View File

@@ -21,10 +21,10 @@ $InputTCPServerRun 514
$WorkDirectory /var/lib/rsyslog
# Added for chef logfiles
$template Chef_log,"/var/log/cobbler/anamon/%hostname%/chef-client.log"
$template Chef_log,"/var/log/chef/%syslogtag%/chef-client.log"
$template Raw, "%rawmsg%"
$template CustomLog, "%msg:::sp-if-no-1st-sp%%msg:::drop-last-lf%\n"
$template Openstack_log, "/var/log/cobbler/anamon/%hostname%/%programname%.log"
$template Chef_Openstack_log, "/var/log/chef/%hostname%/%programname%.log"
#### GLOBAL DIRECTIVES ####
# Use default timestamp format
@@ -76,7 +76,7 @@ local7.* /var/log/boot.log
local3.* -?Chef_log
local4.* -?Openstack_log;CustomLog
local4.* -?Chef_Openstack_log;CustomLog
# ### begin forwarding rule ###
# The statement between the begin ... end define a SINGLE forwarding