openstack/fuel-library
Code Issues Proposed changes

Change nginx directory for dumps

Browse Source 
We will redirect shotgun to generate snapshot in
/var/log/dump to make use of more space available in /var/
log

Change-Id: I0c0832d0c10350898b16d68ed195677fcf975377
Partial-bug: 1529182
This commit is contained in:
Maciej Kwiek 2016-01-27 16:05:33 +01:00
parent b19507b9a7
commit 7ba2d3dc2a
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deployment/puppet/docker/manifests/init.pp
View File

@ -21,6 +21,7 @@ class docker (
'/var/log/docker-logs/puppet', '/var/log/docker-logs/puppet',
'/var/log/docker-logs/rabbitmq', '/var/log/docker-logs/rabbitmq',
'/var/log/docker-logs/supervisor', '/var/log/docker-logs/supervisor',
'/var/log/dump',
'/var/lib/fuel', '/var/lib/fuel',
'/var/lib/fuel/keys', '/var/lib/fuel/keys',
'/var/lib/fuel/ibp', '/var/lib/fuel/ibp',

10
deployment/puppet/docker/spec/classes/docker_spec.rb
View File

@ -19,8 +19,9 @@ describe 'docker' do
context 'with valid params' do context 'with valid params' do
let :params do let :params do
release = '9.0'
default_params.merge!({ default_params.merge!({
:release => '9.0', :release => release,
:dependent_dirs => ["/var/log/docker-logs", "/var/log/docker-logs/remote", :dependent_dirs => ["/var/log/docker-logs", "/var/log/docker-logs/remote",
"/var/log/docker-logs/audit", "/var/log/docker-logs/cobbler", "/var/log/docker-logs/audit", "/var/log/docker-logs/cobbler",
"/var/log/docker-logs/ConsoleKit", "/var/log/docker-logs/coredump", "/var/log/docker-logs/ConsoleKit", "/var/log/docker-logs/coredump",
@ -29,11 +30,12 @@ describe 'docker' do
"/var/log/docker-logs/nginx", "/var/log/docker-logs/ntpstats", "/var/log/docker-logs/nginx", "/var/log/docker-logs/ntpstats",
"/var/log/docker-logs/puppet", "/var/log/docker-logs/rabbitmq", "/var/log/docker-logs/puppet", "/var/log/docker-logs/rabbitmq",
"/var/log/docker-logs/supervisor", "/var/log/docker-logs/supervisor",
"/var/log/dump",
"/var/lib/fuel", "/var/lib/fuel/keys", "/var/lib/fuel/ibp", "/var/lib/fuel", "/var/lib/fuel/keys", "/var/lib/fuel/ibp",
"/var/lib/fuel/container_data", "/var/lib/fuel/container_data",
"/var/lib/fuel/container_data/8.0", "/var/lib/fuel/container_data/#{release}",
"/var/lib/fuel/container_data/8.0/cobbler", "/var/lib/fuel/container_data/#{release}/cobbler",
"/var/lib/fuel/container_data/8.0/postgres", "/var/lib/fuel/container_data/#{release}/postgres",
] ]
}) })
end end

2
deployment/puppet/docker/templates/dockerctl_config.erb
View File

@ -80,6 +80,7 @@ HOST_VOL['logs']="-v /var/log/docker-logs:/var/log"
HOST_VOL['keys']="-v /var/lib/fuel/keys:/var/lib/fuel/keys:rw" HOST_VOL['keys']="-v /var/lib/fuel/keys:/var/lib/fuel/keys:rw"
HOST_VOL['ibp']="-v /var/lib/fuel/ibp:/var/lib/fuel/ibp:rw" HOST_VOL['ibp']="-v /var/lib/fuel/ibp:/var/lib/fuel/ibp:rw"
HOST_VOL['fuel_bootstrap_cli']="-v /etc/fuel-bootstrap-cli:/etc/fuel-bootstrap-cli:rw" HOST_VOL['fuel_bootstrap_cli']="-v /etc/fuel-bootstrap-cli:/etc/fuel-bootstrap-cli:rw"
HOST_VOL['logs_dump']="-v /var/log/dump:/var/dump:rw"
#Persistent directories for container data #Persistent directories for container data
HOST_VOL['astute_data']="-v /var/lib/fuel/container_data/$VERSION/astute:/var/lib/astute" HOST_VOL['astute_data']="-v /var/lib/fuel/container_data/$VERSION/astute:/var/lib/astute"
@ -129,6 +130,7 @@ REQS["$NAILGUN_VOL"]="nginx"
REQS["$COBBLER_VOL"]="mcollective" REQS["$COBBLER_VOL"]="mcollective"
REQS["$ASTUTE_VOL"]="mcollective" REQS["$ASTUTE_VOL"]="mcollective"
REQS["${HOST_VOL['fuel_bootstrap_cli']}"]="mcollective" REQS["${HOST_VOL['fuel_bootstrap_cli']}"]="mcollective"
REQS["${HOST_VOL['logs_dump']}"]="mcollective nginx"
#assemble requirements #assemble requirements
for requirement in "${!REQS[@]}"; do for requirement in "${!REQS[@]}"; do

2
deployment/puppet/nailgun/manifests/nginx.pp
View File

@ -10,7 +10,7 @@ class nailgun::nginx(
$repo_root = '/var/www/nailgun', $repo_root = '/var/www/nailgun',
$staticdir = '/opt/nailgun/share/nailgun/static', $staticdir = '/opt/nailgun/share/nailgun/static',
$templatedir = '/opt/nailgun/share/nailgun/static', $templatedir = '/opt/nailgun/share/nailgun/static',
$logdumpdir = '/var/www/nailgun/dump', $logdumpdir = '/var/dump',
$service_enabled = true, $service_enabled = true,
$ostf_host = '127.0.0.1', $ostf_host = '127.0.0.1',
$keystone_host = '127.0.0.1', $keystone_host = '127.0.0.1',

2
files/fuel-docker-utils/dockerctl_config
View File

@ -80,6 +80,7 @@ HOST_VOL['logs']="-v /var/log/docker-logs:/var/log"
HOST_VOL['keys']="-v /var/lib/fuel/keys:/var/lib/fuel/keys:rw" HOST_VOL['keys']="-v /var/lib/fuel/keys:/var/lib/fuel/keys:rw"
HOST_VOL['ibp']="-v /var/lib/fuel/ibp:/var/lib/fuel/ibp:rw" HOST_VOL['ibp']="-v /var/lib/fuel/ibp:/var/lib/fuel/ibp:rw"
HOST_VOL['fuel_bootstrap_cli']="-v /etc/fuel-bootstrap-cli:/etc/fuel-bootstrap-cli:rw" HOST_VOL['fuel_bootstrap_cli']="-v /etc/fuel-bootstrap-cli:/etc/fuel-bootstrap-cli:rw"
HOST_VOL['logs_dump']="-v /var/log/dump:/var/dump:rw"
#Persistent directories for container data #Persistent directories for container data
HOST_VOL['astute_data']="-v /var/lib/fuel/container_data/$VERSION/astute:/var/lib/astute" HOST_VOL['astute_data']="-v /var/lib/fuel/container_data/$VERSION/astute:/var/lib/astute"
@ -129,6 +130,7 @@ REQS["$NAILGUN_VOL"]="nginx"
REQS["$COBBLER_VOL"]="mcollective" REQS["$COBBLER_VOL"]="mcollective"
REQS["$ASTUTE_VOL"]="mcollective" REQS["$ASTUTE_VOL"]="mcollective"
REQS["${HOST_VOL['fuel_bootstrap_cli']}"]="mcollective" REQS["${HOST_VOL['fuel_bootstrap_cli']}"]="mcollective"
REQS["${HOST_VOL['logs_dump']}"]="mcollective nginx"
#assemble requirements #assemble requirements
for requirement in "${!REQS[@]}"; do for requirement in "${!REQS[@]}"; do