Skip to content

Commit

Permalink
Merge pull request #249 from jlarriba/fix_stdout_logs
Browse files Browse the repository at this point in the history
Do not mount log dirs on the containers
  • Loading branch information
openshift-merge-bot[bot] authored Dec 15, 2023
2 parents fc33446 + 58c7683 commit 7f956e9
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 25 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,5 @@
"owner": "ceilometer",
"perm": "0600"
}
],
"permissions": [
{
"path": "/var/log/containers/ceilometer",
"owner": "ceilometer:ceilometer",
"recurse": true
}
]
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,5 @@
"owner": "ceilometer",
"perm": "0600"
}
],
"permissions": [
{
"path": "/var/log/containers/ceilometer",
"owner": "ceilometer:ceilometer",
"recurse": true
}
]
]
}
8 changes: 1 addition & 7 deletions templates/ceilometercompute/config/ceilometer.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[DEFAULT]
tenant_name_discovery=False
#host=novacompute-01.ctlplane
debug=True
log_dir=/var/log/ceilometer
rpc_response_timeout=60
Expand All @@ -17,12 +16,6 @@ user_domain_name=Default
password={{ .CeilometerPassword }}
interface = internalURL

[cache]
#backend=dogpile.cache.memcached
#enabled=True
#memcache_servers=novacompute-01.ctlplane.localdomain:11211
#tls_enabled=False

[compute]
instance_discovery_method=libvirt_metadata

Expand All @@ -41,6 +34,7 @@ transport_url={{ .TransportURL }}
[publisher]
telemetry_secret=eQ5qb0yysfJ8lx82Vl061vSyY

[cache]
[event]
[ipmi]
[meter]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"volumes": [
"/var/lib/openstack/config/ceilometer:/var/lib/openstack/config/:z",
"/var/lib/openstack/config/ceilometer/ceilometer-agent-compute.json:/var/lib/kolla/config_files/config.json:z",
"/var/log/containers/ceilometer:/var/log/containers/ceilometer:z",
"/run/libvirt:/run/libvirt:shared,z",
"/etc/hosts:/etc/hosts:ro",
"/etc/pki/tls/certs/ca-bundle.trust.crt:/etc/pki/tls/certs/ca-bundle.trust.crt:ro",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"volumes": [
"/var/lib/openstack/config/ceilometer:/var/lib/openstack/config/:z",
"/var/lib/openstack/config/ceilometer/ceilometer-agent-ipmi.json:/var/lib/kolla/config_files/config.json:z",
"/var/log/containers/ceilometer:/var/log/containers/ceilometer:z",
"/run/libvirt:/run/libvirt:shared,z",
"/etc/hosts:/etc/hosts:ro",
"/etc/pki/tls/certs/ca-bundle.trust.crt:/etc/pki/tls/certs/ca-bundle.trust.crt:ro",
Expand Down

0 comments on commit 7f956e9

Please sign in to comment.