6 files changed, 0 insertions, 117 deletions
diff --git a/ansible/roles/aodh/templates/aodh-api.json.j2 b/ansible/roles/aodh/templates/aodh-api.json.j2
deleted file mode 100644
index fc6b0b081..000000000
--- a/ansible/roles/aodh/templates/aodh-api.json.j2
+++ /dev/null
@@ -1,19 +0,0 @@
-{% set aodh_cmd = 'apache2' if kolla_base_distro in ['ubuntu', 'debian'] else 'httpd' %}
-{% set aodh_dir = 'apache2/conf-enabled' if kolla_base_distro in ['ubuntu', 'debian'] else 'httpd/conf.d' %}
-{
-    "command": "{{ aodh_cmd }} -DFOREGROUND",
-    "config_files": [
-        {
-            "source": "{{ container_config_directory }}/aodh.conf",
-            "dest": "/etc/aodh/aodh.conf",
-            "owner": "aodh",
-            "perm": "0600"
-        },
-        {
-            "source": "{{ container_config_directory }}/wsgi-aodh.conf",
-            "dest": "/etc/{{ aodh_dir }}/wsgi-aodh.conf",
-            "owner": "root",
-            "perm": "0600"
-        }
-    ]
-}
diff --git a/ansible/roles/aodh/templates/aodh-evaluator.json.j2 b/ansible/roles/aodh/templates/aodh-evaluator.json.j2
deleted file mode 100644
index 220be5a1e..000000000
--- a/ansible/roles/aodh/templates/aodh-evaluator.json.j2
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "command": "aodh-evaluator",
-    "config_files": [
-        {
-            "source": "{{ container_config_directory }}/aodh.conf",
-            "dest": "/etc/aodh/aodh.conf",
-            "owner": "aodh",
-            "perm": "0600"
-        }
-    ]
-}
diff --git a/ansible/roles/aodh/templates/aodh-listener.json.j2 b/ansible/roles/aodh/templates/aodh-listener.json.j2
deleted file mode 100644
index 3b75e64c8..000000000
--- a/ansible/roles/aodh/templates/aodh-listener.json.j2
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "command": "aodh-listener",
-    "config_files": [
-        {
-            "source": "{{ container_config_directory }}/aodh.conf",
-            "dest": "/etc/aodh/aodh.conf",
-            "owner": "aodh",
-            "perm": "0600"
-        }
-    ]
-}
diff --git a/ansible/roles/aodh/templates/aodh-notifier.json.j2 b/ansible/roles/aodh/templates/aodh-notifier.json.j2
deleted file mode 100644
index da910cd2b..000000000
--- a/ansible/roles/aodh/templates/aodh-notifier.json.j2
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "command": "aodh-notifier",
-    "config_files": [
-        {
-            "source": "{{ container_config_directory }}/aodh.conf",
-            "dest": "/etc/aodh/aodh.conf",
-            "owner": "aodh",
-            "perm": "0600"
-        }
-    ]
-}
diff --git a/ansible/roles/aodh/templates/aodh.conf.j2 b/ansible/roles/aodh/templates/aodh.conf.j2
deleted file mode 100644
index 0295a44af..000000000
--- a/ansible/roles/aodh/templates/aodh.conf.j2
+++ /dev/null
@@ -1,40 +0,0 @@
-#jinja2: trim_blocks: False
-[DEFAULT]
-auth_strategy = keystone
-log_dir = /var/log/kolla/aodh
-debug = {{ aodh_logging_debug }}
-notification_topics = notifications
-
-transport_url = rabbit://{% for host in groups['rabbitmq'] %}{{ rabbitmq_user }}:{{ rabbitmq_password }}@{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %}
-
-[api]
-port = {{ aodh_api_port }}
-host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
-
-[database]
-connection = mysql+pymysql://{{ aodh_database_user }}:{{ aodh_database_password }}@{{ aodh_database_address }}/{{ aodh_database_name }}
-
-
-[keystone_authtoken]
-memcache_security_strategy = ENCRYPT
-memcache_secret_key = {{ memcache_secret_key }}
-memcache_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}
-auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}
-project_domain_name = default
-project_name = service
-user_domain_name = default
-username = {{ aodh_keystone_user }}
-password = {{ aodh_keystone_password }}
-auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
-auth_type = password
-
-
-[service_credentials]
-auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3
-region_name = {{ openstack_region_name }}
-password = {{ aodh_keystone_password }}
-username = {{ aodh_keystone_user }}
-project_name = service
-project_domain_id = default
-user_domain_id = default
-auth_type = password
diff --git a/ansible/roles/aodh/templates/wsgi-aodh.conf.j2 b/ansible/roles/aodh/templates/wsgi-aodh.conf.j2
deleted file mode 100644
index e09266198..000000000
--- a/ansible/roles/aodh/templates/wsgi-aodh.conf.j2
+++ /dev/null
@@ -1,25 +0,0 @@
-{% set python_path = '/usr/lib/python2.7/site-packages' if kolla_install_type == 'binary' else '/var/lib/kolla/venv/lib/python2.7/site-packages' %}
-Listen {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ aodh_api_port }}
-
-<VirtualHost *:{{ aodh_api_port }}>
-
-  ## Vhost docroot
-  DocumentRoot "/var/www/cgi-bin/aodh"
-
-  ## Directories, there should at least be a declaration for /var/www/cgi-bin/aodh
-
-  <Directory "/var/www/cgi-bin/aodh">
-    Options Indexes FollowSymLinks MultiViews
-    AllowOverride None
-    Require all granted
-  </Directory>
-
-  ## Logging
-  ErrorLog "/var/log/kolla/aodh/aodh_wsgi_error.log"
-  ServerSignature Off
-  CustomLog "/var/log/kolla/aodh/aodh_wsgi_access.log" combined
-  WSGIApplicationGroup %{GLOBAL}
-  WSGIDaemonProcess aodh group=aodh processes={{ openstack_service_workers }} threads=1 user=aodh python-path={{ python_path }}
-  WSGIProcessGroup aodh
-  WSGIScriptAlias / "/var/www/cgi-bin/aodh/app.wsgi"
-</VirtualHost>