update compass-core code when log location chagned
Change-Id: Ia68fc70e3e4045db28f92592804d4a7284fe328c
This commit is contained in:
parent
51aac2dd7f
commit
e6ea75052f
@ -219,7 +219,7 @@ def is_host_editable(
|
|||||||
reinstall_os_set=False, exception_when_not_editable=True
|
reinstall_os_set=False, exception_when_not_editable=True
|
||||||
):
|
):
|
||||||
if reinstall_os_set:
|
if reinstall_os_set:
|
||||||
if host.state.state == 'DEPLOYING':
|
if host.state.state == 'INSTALLING':
|
||||||
return _conditional_exception(
|
return _conditional_exception(
|
||||||
host, exception_when_not_editable
|
host, exception_when_not_editable
|
||||||
)
|
)
|
||||||
|
@ -30,10 +30,10 @@ SQLALCHEMY_DATABASE_POOL_SIZE = 10
|
|||||||
SQLALCHEMY_DATABASE_POOL_RECYCLE_PERIOD = 7200
|
SQLALCHEMY_DATABASE_POOL_RECYCLE_PERIOD = 7200
|
||||||
INSTALLATION_LOGDIR = {
|
INSTALLATION_LOGDIR = {
|
||||||
'CobblerInstaller': '/var/log/cobbler/anamon',
|
'CobblerInstaller': '/var/log/cobbler/anamon',
|
||||||
'ChefInstaller': '/var/log/cobbler/anamon'
|
'ChefInstaller': '/var/log/chef'
|
||||||
}
|
}
|
||||||
CLUSTERHOST_INATALLATION_LOGDIR_NAME = 'hostname'
|
CLUSTERHOST_INATALLATION_LOGDIR_NAME = 'name'
|
||||||
HOST_INSTALLATION_LOGDIR_NAME = 'hostname'
|
HOST_INSTALLATION_LOGDIR_NAME = 'name'
|
||||||
DEFAULT_LOGLEVEL = 'debug'
|
DEFAULT_LOGLEVEL = 'debug'
|
||||||
DEFAULT_LOGDIR = '/tmp'
|
DEFAULT_LOGDIR = '/tmp'
|
||||||
DEFAULT_LOGINTERVAL = 1
|
DEFAULT_LOGINTERVAL = 1
|
||||||
|
@ -7,7 +7,7 @@ DATABASE_NAME = 'db'
|
|||||||
SQLALCHEMY_DATABASE_URI = '%s://%s:%s@%s/%s' % (DATABASE_TYPE, DATABASE_USER, DATABASE_PASSWORD, DATABASE_SERVER, DATABASE_NAME)
|
SQLALCHEMY_DATABASE_URI = '%s://%s:%s@%s/%s' % (DATABASE_TYPE, DATABASE_USER, DATABASE_PASSWORD, DATABASE_SERVER, DATABASE_NAME)
|
||||||
INSTALLATION_LOGDIR = {
|
INSTALLATION_LOGDIR = {
|
||||||
'CobblerInstaller': '/var/log/cobbler/anamon',
|
'CobblerInstaller': '/var/log/cobbler/anamon',
|
||||||
'ChefInstaller': '/var/log/cobbler/anamon'
|
'ChefInstaller': '/var/log/chef'
|
||||||
}
|
}
|
||||||
DEFAULT_LOGLEVEL = 'debug'
|
DEFAULT_LOGLEVEL = 'debug'
|
||||||
DEFAULT_LOGDIR = '/var/log/compass'
|
DEFAULT_LOGDIR = '/var/log/compass'
|
||||||
|
@ -21,10 +21,10 @@ $InputTCPServerRun 514
|
|||||||
$WorkDirectory /var/lib/rsyslog
|
$WorkDirectory /var/lib/rsyslog
|
||||||
|
|
||||||
# Added for chef logfiles
|
# 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 Raw, "%rawmsg%"
|
||||||
$template CustomLog, "%msg:::sp-if-no-1st-sp%%msg:::drop-last-lf%\n"
|
$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 ####
|
#### GLOBAL DIRECTIVES ####
|
||||||
|
|
||||||
# Use default timestamp format
|
# Use default timestamp format
|
||||||
@ -76,7 +76,7 @@ local7.* /var/log/boot.log
|
|||||||
|
|
||||||
local3.* -?Chef_log
|
local3.* -?Chef_log
|
||||||
|
|
||||||
local4.* -?Openstack_log;CustomLog
|
local4.* -?Chef_Openstack_log;CustomLog
|
||||||
|
|
||||||
# ### begin forwarding rule ###
|
# ### begin forwarding rule ###
|
||||||
# The statement between the begin ... end define a SINGLE forwarding
|
# The statement between the begin ... end define a SINGLE forwarding
|
||||||
|
Loading…
x
Reference in New Issue
Block a user