diff options
Diffstat (limited to 'ansible/roles/common/templates')
48 files changed, 0 insertions, 524 deletions
diff --git a/ansible/roles/common/templates/admin-openrc.sh.j2 b/ansible/roles/common/templates/admin-openrc.sh.j2 deleted file mode 100644 index ef3890043..000000000 --- a/ansible/roles/common/templates/admin-openrc.sh.j2 +++ /dev/null @@ -1,11 +0,0 @@ -export OS_PROJECT_DOMAIN_NAME=default -export OS_USER_DOMAIN_NAME=default -export OS_PROJECT_NAME=admin -export OS_TENANT_NAME=admin -export OS_USERNAME=admin -export OS_PASSWORD={{ keystone_admin_password }} -export OS_AUTH_URL={{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}/v3 -export OS_IDENTITY_API_VERSION=3 -{% if kolla_enable_tls_external | bool and kolla_external_fqdn_cacert %} -export OS_CACERT={{ kolla_external_fqdn_cacert }} -{% endif %} diff --git a/ansible/roles/common/templates/cron-logrotate-ansible.conf.j2 b/ansible/roles/common/templates/cron-logrotate-ansible.conf.j2 deleted file mode 100644 index 3bc0f435b..000000000 --- a/ansible/roles/common/templates/cron-logrotate-ansible.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -"/var/log/kolla/ansible.log" -{ -} diff --git a/ansible/roles/common/templates/cron-logrotate-aodh.conf.j2 b/ansible/roles/common/templates/cron-logrotate-aodh.conf.j2 deleted file mode 100644 index fd333f6e4..000000000 --- a/ansible/roles/common/templates/cron-logrotate-aodh.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -"/var/log/kolla/aodh/*.log" -{ -} diff --git a/ansible/roles/common/templates/cron-logrotate-barbican.conf.j2 b/ansible/roles/common/templates/cron-logrotate-barbican.conf.j2 deleted file mode 100644 index eaa5f0f49..000000000 --- a/ansible/roles/common/templates/cron-logrotate-barbican.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -"/var/log/kolla/barbican/*.log" -{ -} diff --git a/ansible/roles/common/templates/cron-logrotate-ceilometer.conf.j2 b/ansible/roles/common/templates/cron-logrotate-ceilometer.conf.j2 deleted file mode 100644 index 5993500a5..000000000 --- a/ansible/roles/common/templates/cron-logrotate-ceilometer.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -"/var/log/kolla/ceilometer/*.log" -{ -} diff --git a/ansible/roles/common/templates/cron-logrotate-cinder.conf.j2 b/ansible/roles/common/templates/cron-logrotate-cinder.conf.j2 deleted file mode 100644 index b5e59abd2..000000000 --- a/ansible/roles/common/templates/cron-logrotate-cinder.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -"/var/log/kolla/cinder/*.log" -{ -} diff --git a/ansible/roles/common/templates/cron-logrotate-cloudkitty.conf.j2 b/ansible/roles/common/templates/cron-logrotate-cloudkitty.conf.j2 deleted file mode 100644 index 2dada642d..000000000 --- a/ansible/roles/common/templates/cron-logrotate-cloudkitty.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -"/var/log/kolla/cloudkitty/*.log" -{ -} diff --git a/ansible/roles/common/templates/cron-logrotate-elasticsearch.conf.j2 b/ansible/roles/common/templates/cron-logrotate-elasticsearch.conf.j2 deleted file mode 100644 index cbdd2c780..000000000 --- a/ansible/roles/common/templates/cron-logrotate-elasticsearch.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -"/var/log/kolla/elasticsearch/*.log" -{ -} diff --git a/ansible/roles/common/templates/cron-logrotate-glance.conf.j2 b/ansible/roles/common/templates/cron-logrotate-glance.conf.j2 deleted file mode 100644 index 5b20985bd..000000000 --- a/ansible/roles/common/templates/cron-logrotate-glance.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -"/var/log/kolla/glance/*.log" -{ -} diff --git a/ansible/roles/common/templates/cron-logrotate-global.conf.j2 b/ansible/roles/common/templates/cron-logrotate-global.conf.j2 deleted file mode 100644 index c21e3d1c0..000000000 --- a/ansible/roles/common/templates/cron-logrotate-global.conf.j2 +++ /dev/null @@ -1,21 +0,0 @@ -weekly - -rotate 6 - -copytruncate - -compress - -delaycompress - -notifempty - -missingok - -minsize 30M - -maxsize 100M - -su root kolla - -include /etc/logrotate.d diff --git a/ansible/roles/common/templates/cron-logrotate-gnocchi.conf.j2 b/ansible/roles/common/templates/cron-logrotate-gnocchi.conf.j2 deleted file mode 100644 index d6d5d6f44..000000000 --- a/ansible/roles/common/templates/cron-logrotate-gnocchi.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -"/var/log/kolla/gnocchi/*.log" -{ -} diff --git a/ansible/roles/common/templates/cron-logrotate-grafana.conf.j2 b/ansible/roles/common/templates/cron-logrotate-grafana.conf.j2 deleted file mode 100644 index 2a3a0889a..000000000 --- a/ansible/roles/common/templates/cron-logrotate-grafana.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -"/var/log/kolla/grafana/*.log" -{ -} diff --git a/ansible/roles/common/templates/cron-logrotate-haproxy.conf.j2 b/ansible/roles/common/templates/cron-logrotate-haproxy.conf.j2 deleted file mode 100644 index 7af26dd38..000000000 --- a/ansible/roles/common/templates/cron-logrotate-haproxy.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -"/var/log/kolla/haproxy/haproxy.log" -{ -} diff --git a/ansible/roles/common/templates/cron-logrotate-heat.conf.j2 b/ansible/roles/common/templates/cron-logrotate-heat.conf.j2 deleted file mode 100644 index 7f5e89a77..000000000 --- a/ansible/roles/common/templates/cron-logrotate-heat.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -"/var/log/kolla/heat/*.log" -{ -} diff --git a/ansible/roles/common/templates/cron-logrotate-iscsid.conf.j2 b/ansible/roles/common/templates/cron-logrotate-iscsid.conf.j2 deleted file mode 100644 index 47fd93d1a..000000000 --- a/ansible/roles/common/templates/cron-logrotate-iscsid.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -"/var/log/kolla/iscsi/iscsi.log" -{ -} diff --git a/ansible/roles/common/templates/cron-logrotate-keepalived.conf.j2 b/ansible/roles/common/templates/cron-logrotate-keepalived.conf.j2 deleted file mode 100644 index 680874634..000000000 --- a/ansible/roles/common/templates/cron-logrotate-keepalived.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -"/var/log/kolla/keepalived/keepalived.log" -{ -} diff --git a/ansible/roles/common/templates/cron-logrotate-keystone.conf.j2 b/ansible/roles/common/templates/cron-logrotate-keystone.conf.j2 deleted file mode 100644 index 79cf10b34..000000000 --- a/ansible/roles/common/templates/cron-logrotate-keystone.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -"/var/log/kolla/keystone/*.log" -{ -} diff --git a/ansible/roles/common/templates/cron-logrotate-magnum.conf.j2 b/ansible/roles/common/templates/cron-logrotate-magnum.conf.j2 deleted file mode 100644 index 4b2c2af4e..000000000 --- a/ansible/roles/common/templates/cron-logrotate-magnum.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -"/var/log/kolla/magnum/*.log" -{ -} diff --git a/ansible/roles/common/templates/cron-logrotate-manila.conf.j2 b/ansible/roles/common/templates/cron-logrotate-manila.conf.j2 deleted file mode 100644 index 9b9719514..000000000 --- a/ansible/roles/common/templates/cron-logrotate-manila.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -"/var/log/kolla/manila/*.log" -{ -} diff --git a/ansible/roles/common/templates/cron-logrotate-mariadb.conf.j2 b/ansible/roles/common/templates/cron-logrotate-mariadb.conf.j2 deleted file mode 100644 index 8543983e0..000000000 --- a/ansible/roles/common/templates/cron-logrotate-mariadb.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -"/var/log/kolla/mariadb/*.log" -{ -} diff --git a/ansible/roles/common/templates/cron-logrotate-mistral.conf.j2 b/ansible/roles/common/templates/cron-logrotate-mistral.conf.j2 deleted file mode 100644 index e8e6da8e3..000000000 --- a/ansible/roles/common/templates/cron-logrotate-mistral.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -"/var/log/kolla/mistral/*.log" -{ -} diff --git a/ansible/roles/common/templates/cron-logrotate-murano.conf.j2 b/ansible/roles/common/templates/cron-logrotate-murano.conf.j2 deleted file mode 100644 index ab3309019..000000000 --- a/ansible/roles/common/templates/cron-logrotate-murano.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -"/var/log/kolla/murano/*.log" -{ -} diff --git a/ansible/roles/common/templates/cron-logrotate-neutron.conf.j2 b/ansible/roles/common/templates/cron-logrotate-neutron.conf.j2 deleted file mode 100644 index f4c226829..000000000 --- a/ansible/roles/common/templates/cron-logrotate-neutron.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -"/var/log/kolla/neutron/*.log" -{ -} diff --git a/ansible/roles/common/templates/cron-logrotate-nova.conf.j2 b/ansible/roles/common/templates/cron-logrotate-nova.conf.j2 deleted file mode 100644 index 657a994da..000000000 --- a/ansible/roles/common/templates/cron-logrotate-nova.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -"/var/log/kolla/nova/*.log" -{ -} diff --git a/ansible/roles/common/templates/cron-logrotate-rabbitmq.conf.j2 b/ansible/roles/common/templates/cron-logrotate-rabbitmq.conf.j2 deleted file mode 100644 index cf2dc3f36..000000000 --- a/ansible/roles/common/templates/cron-logrotate-rabbitmq.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -"/var/log/kolla/rabbitmq/*.log" -{ -} diff --git a/ansible/roles/common/templates/cron-logrotate-sahara.conf.j2 b/ansible/roles/common/templates/cron-logrotate-sahara.conf.j2 deleted file mode 100644 index 57a98d315..000000000 --- a/ansible/roles/common/templates/cron-logrotate-sahara.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -"/var/log/kolla/sahara/*.log" -{ -} diff --git a/ansible/roles/common/templates/cron-logrotate-searchlight.conf.j2 b/ansible/roles/common/templates/cron-logrotate-searchlight.conf.j2 deleted file mode 100644 index da916664a..000000000 --- a/ansible/roles/common/templates/cron-logrotate-searchlight.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -"/var/log/kolla/searchlight/*.log" -{ -} diff --git a/ansible/roles/common/templates/cron-logrotate-senlin.conf.j2 b/ansible/roles/common/templates/cron-logrotate-senlin.conf.j2 deleted file mode 100644 index b4a61be8c..000000000 --- a/ansible/roles/common/templates/cron-logrotate-senlin.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -"/var/log/kolla/senlin/*.log" -{ -} diff --git a/ansible/roles/common/templates/cron-logrotate-swift.conf.j2 b/ansible/roles/common/templates/cron-logrotate-swift.conf.j2 deleted file mode 100644 index 0ad2badf1..000000000 --- a/ansible/roles/common/templates/cron-logrotate-swift.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -"/var/log/kolla/swift/*.log" -{ -} diff --git a/ansible/roles/common/templates/cron-logrotate-watcher.conf.j2 b/ansible/roles/common/templates/cron-logrotate-watcher.conf.j2 deleted file mode 100644 index e7edaf909..000000000 --- a/ansible/roles/common/templates/cron-logrotate-watcher.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -"/var/log/kolla/watcher/*.log" -{ -} diff --git a/ansible/roles/common/templates/cron.json.j2 b/ansible/roles/common/templates/cron.json.j2 deleted file mode 100644 index 8a338195e..000000000 --- a/ansible/roles/common/templates/cron.json.j2 +++ /dev/null @@ -1,50 +0,0 @@ -{% set cron_cmd = 'cron -f' if kolla_base_distro in ['ubuntu', 'debian'] else 'crond -s -n' %} -{% set services = [ - ( 'ansible', 'yes' ), - ( 'aodh', enable_aodh ), - ( 'barbican', enable_barbican ), - ( 'ceilometer', enable_ceilometer ), - ( 'cinder', enable_cinder ), - ( 'cloudkitty', enable_cloudkitty ), - ( 'elasticsearch', enable_elasticsearch ), - ( 'glance', enable_glance ), - ( 'gnocchi', enable_gnocchi ), - ( 'grafana', enable_grafana ), - ( 'haproxy', enable_haproxy ), - ( 'heat', enable_heat ), - ( 'iscsid', enable_iscsid ), - ( 'keepalived', enable_haproxy ), - ( 'keystone', enable_keystone ), - ( 'magnum', enable_magnum ), - ( 'manila', enable_manila ), - ( 'mariadb', enable_mariadb ), - ( 'mistral', enable_mistral ), - ( 'murano', enable_murano ), - ( 'neutron', enable_neutron ), - ( 'nova', enable_nova ), - ( 'rabbitmq', enable_rabbitmq ), - ( 'sahara', enable_sahara ), - ( 'searchlight', enable_searchlight ), - ( 'senlin', enable_senlin ), - ( 'swift', enable_swift ) -] %} -{ - "command": "{{ cron_cmd }}", - "config_files": [ - { - "source": "{{ container_config_directory }}/logrotate/global.conf", - "dest": "/etc/logrotate.conf", - "owner": "root", - "perm": "0644" - }, -{% for service, enabled in services if enabled | bool %} - { - "source": "{{ container_config_directory }}/logrotate/{{ service }}.conf", - "dest": "/etc/logrotate.d/{{ service }}.conf", - "owner": "root", - "perm": "0644" - }{{ ',' if not loop.last else '' }} -{% endfor %} - - ] -} diff --git a/ansible/roles/common/templates/heka-aodh.toml.j2 b/ansible/roles/common/templates/heka-aodh.toml.j2 deleted file mode 100644 index 419d923e9..000000000 --- a/ansible/roles/common/templates/heka-aodh.toml.j2 +++ /dev/null @@ -1,13 +0,0 @@ -[aodh_apache_log_decoder] -type = "SandboxDecoder" -filename = "lua_decoders/os_aodh_apache_log.lua" - [aodh_apache_log_decoder.config] - apache_log_pattern = '%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"' - -[aodh_apache_logstreamer_input] -type = "LogstreamerInput" -decoder = "aodh_apache_log_decoder" -log_directory = "/var/log/kolla" -file_match = 'aodh/aodh-apache-(?P<Service>.+)-access\.log\.?(?P<Seq>\d*)$' -priority = ["^Seq"] -differentiator = ["aodh-apache-", "Service"] diff --git a/ansible/roles/common/templates/heka-barbican.toml.j2 b/ansible/roles/common/templates/heka-barbican.toml.j2 deleted file mode 100644 index 9ec0e8c6b..000000000 --- a/ansible/roles/common/templates/heka-barbican.toml.j2 +++ /dev/null @@ -1,13 +0,0 @@ -[barbican_apache_log_decoder] -type = "SandboxDecoder" -filename = "lua_decoders/os_barbican_apache_log.lua" - [barbican_apache_log_decoder.config] - apache_log_pattern = '%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"' - -[barbican_apache_logstreamer_input] -type = "LogstreamerInput" -decoder = "barbican_apache_log_decoder" -log_directory = "/var/log/kolla" -file_match = 'barbican/barbican-apache-(?P<Service>.+)-access\.log\.?(?P<Seq>\d*)$' -priority = ["^Seq"] -differentiator = ["barbican-apache-", "Service"] diff --git a/ansible/roles/common/templates/heka-ceilometer.toml.j2 b/ansible/roles/common/templates/heka-ceilometer.toml.j2 deleted file mode 100644 index cb2cb538e..000000000 --- a/ansible/roles/common/templates/heka-ceilometer.toml.j2 +++ /dev/null @@ -1,13 +0,0 @@ -[ceilometer_apache_log_decoder] -type = "SandboxDecoder" -filename = "lua_decoders/os_ceilometer_apache_log.lua" - [ceilometer_apache_log_decoder.config] - apache_log_pattern = '%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"' - -[ceilometer_apache_logstreamer_input] -type = "LogstreamerInput" -decoder = "ceilometer_apache_log_decoder" -log_directory = "/var/log/kolla" -file_match = 'ceilometer/(?P<Service>ceilometer-api.*)\.log\.?(?P<Seq>\d*)$' -priority = ["^Seq"] -differentiator = ["Service"] diff --git a/ansible/roles/common/templates/heka-elasticsearch.toml.j2 b/ansible/roles/common/templates/heka-elasticsearch.toml.j2 deleted file mode 100644 index f3d4b1346..000000000 --- a/ansible/roles/common/templates/heka-elasticsearch.toml.j2 +++ /dev/null @@ -1,16 +0,0 @@ -[elasticsearch_json_encoder] -type = "ESJsonEncoder" -index = {{'"%{Type}-%{%Y.%m.%d}"'}} -es_index_from_timestamp = true -fields = ["Timestamp", "Type", "Logger", "Severity", "Payload", "Pid", "Hostname", "DynamicFields"] - -[elasticsearch_output] -type = "ElasticSearchOutput" -server = "{{ elasticsearch_protocol }}://{{ elasticsearch_address }}:{{ elasticsearch_port }}" -message_matcher = "Type == 'log'" -encoder = "elasticsearch_json_encoder" -use_buffering = true - [elasticsearch_output.buffering] - max_buffer_size = 1073741824 # 1024 * 1024 * 1024 - max_file_size = 134217728 # 128 * 1024 * 1024 - full_action = "drop" diff --git a/ansible/roles/common/templates/heka-global.toml.j2 b/ansible/roles/common/templates/heka-global.toml.j2 deleted file mode 100644 index 5e325026a..000000000 --- a/ansible/roles/common/templates/heka-global.toml.j2 +++ /dev/null @@ -1,30 +0,0 @@ -[hekad] -maxprocs = {{ ansible_processor_count * ansible_processor_cores }} - -[syslog_encoder] -type = "SandboxEncoder" -filename = "lua_encoders/os_syslog.lua" - -[syslog_log_decoder] -type = "SandboxDecoder" -filename = "lua_decoders/os_syslog.lua" - [syslog_log_decoder.config] - hostname = "{{ ansible_hostname }}" - -[swift_log_decoder] -type = "SandboxDecoder" -filename = "lua_decoders/os_swift_log.lua" - [swift_log_decoder.config] - hostname = "{{ ansible_hostname }}" - -[multi_log_decoder] -type = "MultiDecoder" -subs = ["syslog_log_decoder", "swift_log_decoder"] -cascade_strategy = "first-wins" - -[syslog_input] -type = "UdpInput" -net = "unixgram" -address = "/var/lib/kolla/heka/log" -decoder = "multi_log_decoder" -splitter = "NullSplitter" diff --git a/ansible/roles/common/templates/heka-gnocchi.toml.j2 b/ansible/roles/common/templates/heka-gnocchi.toml.j2 deleted file mode 100644 index e2596762d..000000000 --- a/ansible/roles/common/templates/heka-gnocchi.toml.j2 +++ /dev/null @@ -1,13 +0,0 @@ -[gnocchi_apache_log_decoder] -type = "SandboxDecoder" -filename = "lua_decoders/os_gnocchi_apache_log.lua" - [gnocchi_apache_log_decoder.config] - apache_log_pattern = '%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"' - -[gnocchi_apache_logstreamer_input] -type = "LogstreamerInput" -decoder = "gnocchi_apache_log_decoder" -log_directory = "/var/log/kolla" -file_match = 'gnocchi/gnocchi-apache-(?P<Service>.+)-access\.log\.?(?P<Seq>\d*)$' -priority = ["^Seq"] -differentiator = ["gnocchi-apache-", "Service"] diff --git a/ansible/roles/common/templates/heka-grafana.toml.j2 b/ansible/roles/common/templates/heka-grafana.toml.j2 deleted file mode 100644 index 7565c083e..000000000 --- a/ansible/roles/common/templates/heka-grafana.toml.j2 +++ /dev/null @@ -1,18 +0,0 @@ -[grafana_log_decoder] -type = "SandboxDecoder" -filename = "lua_decoders/os_grafana_log.lua" - -[grafana_log_splitter] -type = "RegexSplitter" -delimiter = '\n\n(=[^=]+====)' -delimiter_eol = false -deliver_incomplete_final = true - -[grafana_logstreamer_input] -type = "LogstreamerInput" -decoder = "grafana_log_decoder" -splitter = "grafana_log_splitter" -log_directory = "/var/log/kolla" -file_match = 'grafana/(?P<Service>grafana.*)\.log\.?(?P<Seq>\d*)$' -priority = ["^Seq"] -differentiator = ["Service"] diff --git a/ansible/roles/common/templates/heka-haproxy.toml.j2 b/ansible/roles/common/templates/heka-haproxy.toml.j2 deleted file mode 100644 index 49338fd0a..000000000 --- a/ansible/roles/common/templates/heka-haproxy.toml.j2 +++ /dev/null @@ -1,9 +0,0 @@ -# HAProxy writes its logs to Syslog, so the generic -# Syslog input set in heka-global.toml.j2 is used. - -[haproxy_file_output] -type = "FileOutput" -message_matcher = "Fields[programname] =~ /(?i:haproxy)/" -path = "/var/log/kolla/haproxy/haproxy.log" -encoder = "syslog_encoder" -folder_perm = "755" diff --git a/ansible/roles/common/templates/heka-horizon.toml.j2 b/ansible/roles/common/templates/heka-horizon.toml.j2 deleted file mode 100644 index b447e9938..000000000 --- a/ansible/roles/common/templates/heka-horizon.toml.j2 +++ /dev/null @@ -1,13 +0,0 @@ -[horizon_apache_log_decoder] -type = "SandboxDecoder" -filename = "lua_decoders/os_horizon_apache_log.lua" - [horizon_apache_log_decoder.config] - apache_log_pattern = '%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"' - -[horizon_apache_logstreamer_input] -type = "LogstreamerInput" -decoder = "horizon_apache_log_decoder" -log_directory = "/var/log/kolla" -file_match = 'horizon/(?P<Service>horizon.*)\.log\.?(?P<Seq>\d*)$' -priority = ["^Seq"] -differentiator = ["Service"] diff --git a/ansible/roles/common/templates/heka-keepalived.toml.j2 b/ansible/roles/common/templates/heka-keepalived.toml.j2 deleted file mode 100644 index 215998234..000000000 --- a/ansible/roles/common/templates/heka-keepalived.toml.j2 +++ /dev/null @@ -1,9 +0,0 @@ -# Keepalived writes its logs to Syslog, so the generic -# Syslog input set in heka-global.toml.j2 is used. - -[keepalived_file_output] -type = "FileOutput" -message_matcher = "Fields[programname] =~ /(?i:keepalived)/" -path = "/var/log/kolla/keepalived/keepalived.log" -encoder = "syslog_encoder" -folder_perm = "755" diff --git a/ansible/roles/common/templates/heka-keystone.toml.j2 b/ansible/roles/common/templates/heka-keystone.toml.j2 deleted file mode 100644 index 19cc69c6d..000000000 --- a/ansible/roles/common/templates/heka-keystone.toml.j2 +++ /dev/null @@ -1,13 +0,0 @@ -[keystone_apache_log_decoder] -type = "SandboxDecoder" -filename = "lua_decoders/os_keystone_apache_log.lua" - [keystone_apache_log_decoder.config] - apache_log_pattern = '%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"' - -[keystone_apache_logstreamer_input] -type = "LogstreamerInput" -decoder = "keystone_apache_log_decoder" -log_directory = "/var/log/kolla" -file_match = 'keystone/keystone-apache-(?P<Service>.+)-access\.log\.?(?P<Seq>\d*)$' -priority = ["^Seq"] -differentiator = ["keystone-apache-", "Service"] diff --git a/ansible/roles/common/templates/heka-mariadb.toml.j2 b/ansible/roles/common/templates/heka-mariadb.toml.j2 deleted file mode 100644 index 07d710541..000000000 --- a/ansible/roles/common/templates/heka-mariadb.toml.j2 +++ /dev/null @@ -1,11 +0,0 @@ -[mariadb_log_decoder] -type = "SandboxDecoder" -filename = "lua_decoders/os_mysql_log.lua" - -[mariadb_logstreamer_input] -type = "LogstreamerInput" -decoder = "mariadb_log_decoder" -log_directory = "/var/log/kolla" -file_match = 'mariadb/mariadb\.log\.?(?P<Seq>\d*)$' -priority = ["^Seq"] -differentiator = ['mariadb'] diff --git a/ansible/roles/common/templates/heka-openstack.toml.j2 b/ansible/roles/common/templates/heka-openstack.toml.j2 deleted file mode 100644 index ef6334dc1..000000000 --- a/ansible/roles/common/templates/heka-openstack.toml.j2 +++ /dev/null @@ -1,11 +0,0 @@ -[openstack_log_decoder] -type = "SandboxDecoder" -filename = "lua_decoders/os_openstack_log.lua" - -[openstack_logstreamer_input] -type = "LogstreamerInput" -decoder = "openstack_log_decoder" -log_directory = "/var/log/kolla" -file_match = '(?P<Service>cloudkitty|nova|glance|keystone|neutron|ceilometer|ceph|cinder|heat|murano|magnum|mistral|manila|searchlight|senlin|sahara)/(?P<Program>.*)\.log\.?(?P<Seq>\d*)$' -priority = ["^Seq"] -differentiator = ["Service", "_", "Program"] diff --git a/ansible/roles/common/templates/heka-rabbitmq.toml.j2 b/ansible/roles/common/templates/heka-rabbitmq.toml.j2 deleted file mode 100644 index d2c49aa1e..000000000 --- a/ansible/roles/common/templates/heka-rabbitmq.toml.j2 +++ /dev/null @@ -1,18 +0,0 @@ -[rabbitmq_log_decoder] -type = "SandboxDecoder" -filename = "lua_decoders/os_rabbitmq_log.lua" - -[rabbitmq_log_splitter] -type = "RegexSplitter" -delimiter = '\n\n(=[^=]+====)' -delimiter_eol = false -deliver_incomplete_final = true - -[rabbitmq_logstreamer_input] -type = "LogstreamerInput" -decoder = "rabbitmq_log_decoder" -splitter = "rabbitmq_log_splitter" -log_directory = "/var/log/kolla" -file_match = 'rabbitmq/(?P<Service>rabbit.*)\.log\.?(?P<Seq>\d*)$' -priority = ["^Seq"] -differentiator = ["Service"] diff --git a/ansible/roles/common/templates/heka-swift.toml.j2 b/ansible/roles/common/templates/heka-swift.toml.j2 deleted file mode 100644 index c70b1631d..000000000 --- a/ansible/roles/common/templates/heka-swift.toml.j2 +++ /dev/null @@ -1,9 +0,0 @@ -# Swift writes its logs to Syslog, so the generic Syslog input set in -# heka-global.toml.j2 is used. - -[{{ item.name }}_file_output] -type = "FileOutput" -message_matcher = "Fields[programname] == '{{ item.name }}'" -path = "/var/log/kolla/swift/{{ item.name }}.log" -encoder = "syslog_encoder" -folder_perm = "755" diff --git a/ansible/roles/common/templates/heka.json.j2 b/ansible/roles/common/templates/heka.json.j2 deleted file mode 100644 index a49258e4a..000000000 --- a/ansible/roles/common/templates/heka.json.j2 +++ /dev/null @@ -1,139 +0,0 @@ -{% set swift_services = ["swift-account-auditor", "swift-account-reaper", "swift-account-replicator", "swift-account-server", "swift-container-auditor", "swift-container-replicator", "swift-container-server", "swift-container-updater", "swift-object-auditor", "swift-object-expirer", "swift-object-replicator", "swift-object-server", "swift-object-updater", "swift-proxy-server", "swift-rsyncd"] %} -{ - "command": "/usr/bin/hekad -config=/etc/heka/", - "config_files": [ - { - "source": "{{ container_config_directory }}/heka-elasticsearch.toml", - "dest": "/etc/heka/heka-elasticsearch.toml", - "owner": "heka", - "perm": "0600", - "optional": {{ (not enable_central_logging | bool) | string | lower }} - }, - { - "source": "{{ container_config_directory }}/heka-global.toml", - "dest": "/etc/heka/heka-global.toml", - "owner": "heka", - "perm": "0600" - }, - { - "source": "{{ container_config_directory }}/heka-aodh.toml", - "dest": "/etc/heka/heka-aodh.toml", - "owner": "heka", - "perm": "0600", - "optional": {{ (not enable_aodh | bool) | string | lower }} - }, - { - "source": "{{ container_config_directory }}/heka-gnocchi.toml", - "dest": "/etc/heka/heka-gnocchi.toml", - "owner": "heka", - "perm": "0600", - "optional": {{ (not enable_gnocchi | bool) | string | lower }} - }, - { - "source": "{{ container_config_directory }}/heka-grafana.toml", - "dest": "/etc/heka/heka-grafana.toml", - "owner": "heka", - "perm": "0600", - "optional": {{ (not enable_grafana | bool) | string | lower }} - }, - { - "source": "{{ container_config_directory }}/heka-barbican.toml", - "dest": "/etc/heka/heka-barbican.toml", - "owner": "heka", - "perm": "0600", - "optional": {{ (not enable_barbican | bool) | string | lower }} - }, - { - "source": "{{ container_config_directory }}/heka-custom.toml", - "dest": "/etc/heka/heka-custom.toml", - "owner": "heka", - "perm": "0600", - "optional": true - }, - { - "source": "{{ container_config_directory }}/heka-haproxy.toml", - "dest": "/etc/heka/heka-haproxy.toml", - "owner": "heka", - "perm": "0600", - "optional": {{ (not enable_haproxy | bool) | string | lower }} - }, - { - "source": "{{ container_config_directory }}/heka-keepalived.toml", - "dest": "/etc/heka/heka-keepalived.toml", - "owner": "heka", - "perm": "0600", - "optional": {{ (not enable_haproxy | bool) | string | lower }} - }, - { - "source": "{{ container_config_directory }}/heka-rabbitmq.toml", - "dest": "/etc/heka/heka-rabbitmq.toml", - "owner": "heka", - "perm": "0600", - "optional": {{ (not enable_rabbitmq | bool) | string | lower }} - }, - { - "source": "{{ container_config_directory }}/heka-openstack.toml", - "dest": "/etc/heka/heka-openstack.toml", - "owner": "heka", - "perm": "0600" - }, - { - "source": "{{ container_config_directory }}/heka-mariadb.toml", - "dest": "/etc/heka/heka-mariadb.toml", - "owner": "heka", - "perm": "0600", - "optional": {{ (not enable_mariadb | bool) | string | lower }} - }, - { - "source": "{{ container_config_directory }}/heka-keystone.toml", - "dest": "/etc/heka/heka-keystone.toml", - "owner": "heka", - "perm": "0600", - "optional": {{ (not enable_keystone | bool) | string | lower }} - }, - { - "source": "{{ container_config_directory }}/heka-horizon.toml", - "dest": "/etc/heka/heka-horizon.toml", - "owner": "heka", - "perm": "0600", - "optional": {{ (not enable_horizon | bool) | string | lower }} - }, -{% for swift_service in swift_services %} - { - "source": "{{ container_config_directory }}/heka-{{ swift_service }}.toml", - "dest": "/etc/heka/heka-{{ swift_service }}.toml", - "owner": "heka", - "perm": "0600", - "optional": {{ (not enable_swift | bool) | string | lower }} - }{% if not loop.last %},{% endif %} -{% endfor %} - - ], - "permissions": [ - { - "path": "/var/cache/hekad", - "owner": "heka:heka", - "recurse": true - }, - { - "path": "/var/lib/kolla/heka", - "owner": "heka:heka", - "recurse": true - }, - { - "path": "/var/log/kolla/haproxy", - "owner": "heka:kolla", - "recurse": true - }, - { - "path": "/var/log/kolla/keepalived", - "owner": "heka:kolla", - "recurse": true - }, - { - "path": "/var/log/kolla/swift", - "owner": "heka:kolla", - "recurse": true - } - ] -} diff --git a/ansible/roles/common/templates/kolla-toolbox.json.j2 b/ansible/roles/common/templates/kolla-toolbox.json.j2 deleted file mode 100644 index 7f0dc0519..000000000 --- a/ansible/roles/common/templates/kolla-toolbox.json.j2 +++ /dev/null @@ -1,10 +0,0 @@ -{ - "command": "sleep infinity", - "config_files": [], - "permissions": [ - { - "path": "/var/log/kolla/ansible.log", - "owner": "ansible:ansible" - } - ] -} |