diff --git a/templates/ceilometercompute/config/ceilometer-agent-compute.json b/templates/ceilometercompute/config/ceilometer-agent-compute.json index bac2d032..5e262c77 100644 --- a/templates/ceilometercompute/config/ceilometer-agent-compute.json +++ b/templates/ceilometercompute/config/ceilometer-agent-compute.json @@ -13,12 +13,5 @@ "owner": "ceilometer", "perm": "0600" } - ], - "permissions": [ - { - "path": "/var/log/containers/ceilometer", - "owner": "ceilometer:ceilometer", - "recurse": true - } - ] + ] } diff --git a/templates/ceilometercompute/config/ceilometer-agent-ipmi.json b/templates/ceilometercompute/config/ceilometer-agent-ipmi.json index d62c6be6..734b44c0 100644 --- a/templates/ceilometercompute/config/ceilometer-agent-ipmi.json +++ b/templates/ceilometercompute/config/ceilometer-agent-ipmi.json @@ -13,12 +13,5 @@ "owner": "ceilometer", "perm": "0600" } - ], - "permissions": [ - { - "path": "/var/log/containers/ceilometer", - "owner": "ceilometer:ceilometer", - "recurse": true - } - ] + ] } diff --git a/templates/ceilometercompute/config/ceilometer.conf b/templates/ceilometercompute/config/ceilometer.conf index 2a9d8da1..33ceeff5 100644 --- a/templates/ceilometercompute/config/ceilometer.conf +++ b/templates/ceilometercompute/config/ceilometer.conf @@ -1,6 +1,5 @@ [DEFAULT] tenant_name_discovery=False -#host=novacompute-01.ctlplane debug=True log_dir=/var/log/ceilometer rpc_response_timeout=60 @@ -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 @@ -41,6 +34,7 @@ transport_url={{ .TransportURL }} [publisher] telemetry_secret=eQ5qb0yysfJ8lx82Vl061vSyY +[cache] [event] [ipmi] [meter] diff --git a/templates/ceilometercompute/config/ceilometer_agent_compute.json b/templates/ceilometercompute/config/ceilometer_agent_compute.json index 924d2e93..301c3fe1 100644 --- a/templates/ceilometercompute/config/ceilometer_agent_compute.json +++ b/templates/ceilometercompute/config/ceilometer_agent_compute.json @@ -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", diff --git a/templates/ceilometercompute/config/ceilometer_agent_ipmi.json b/templates/ceilometercompute/config/ceilometer_agent_ipmi.json index 7dfd38dc..143619b0 100644 --- a/templates/ceilometercompute/config/ceilometer_agent_ipmi.json +++ b/templates/ceilometercompute/config/ceilometer_agent_ipmi.json @@ -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",