diff options
Diffstat (limited to 'ansible/roles/aodh')
| -rw-r--r-- | ansible/roles/aodh/defaults/main.yml | 43 | ||||
| -rw-r--r-- | ansible/roles/aodh/meta/main.yml | 3 | ||||
| -rw-r--r-- | ansible/roles/aodh/tasks/bootstrap.yml | 41 | ||||
| -rw-r--r-- | ansible/roles/aodh/tasks/bootstrap_service.yml | 21 | ||||
| -rw-r--r-- | ansible/roles/aodh/tasks/config.yml | 63 | ||||
| -rw-r--r-- | ansible/roles/aodh/tasks/deploy.yml | 18 | ||||
| -rw-r--r-- | ansible/roles/aodh/tasks/main.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/aodh/tasks/precheck.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/aodh/tasks/pull.yml | 28 | ||||
| -rw-r--r-- | ansible/roles/aodh/tasks/reconfigure.yml | 79 | ||||
| -rw-r--r-- | ansible/roles/aodh/tasks/register.yml | 40 | ||||
| -rw-r--r-- | ansible/roles/aodh/tasks/start.yml | 49 | ||||
| -rw-r--r-- | ansible/roles/aodh/tasks/upgrade.yml | 6 | ||||
| -rw-r--r-- | ansible/roles/aodh/templates/aodh-api.json.j2 | 19 | ||||
| -rw-r--r-- | ansible/roles/aodh/templates/aodh-evaluator.json.j2 | 11 | ||||
| -rw-r--r-- | ansible/roles/aodh/templates/aodh-listener.json.j2 | 11 | ||||
| -rw-r--r-- | ansible/roles/aodh/templates/aodh-notifier.json.j2 | 11 | ||||
| -rw-r--r-- | ansible/roles/aodh/templates/aodh.conf.j2 | 40 | ||||
| -rw-r--r-- | ansible/roles/aodh/templates/wsgi-aodh.conf.j2 | 25 |
19 files changed, 0 insertions, 511 deletions
diff --git a/ansible/roles/aodh/defaults/main.yml b/ansible/roles/aodh/defaults/main.yml deleted file mode 100644 index 66e2b9459..000000000 --- a/ansible/roles/aodh/defaults/main.yml +++ /dev/null @@ -1,43 +0,0 @@ ---- -project_name: "aodh" - - -#################### -# Database -#################### -aodh_database_name: "aodh" -aodh_database_user: "aodh" -aodh_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}" - -#################### -# Docker -#################### -aodh_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-aodh-api" -aodh_api_tag: "{{ openstack_release }}" -aodh_api_image_full: "{{ aodh_api_image }}:{{ aodh_api_tag }}" - -aodh_evaluator_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-aodh-evaluator" -aodh_evaluator_tag: "{{ openstack_release }}" -aodh_evaluator_image_full: "{{ aodh_evaluator_image }}:{{ aodh_evaluator_tag }}" - -aodh_listener_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-aodh-listener" -aodh_listener_tag: "{{ openstack_release }}" -aodh_listener_image_full: "{{ aodh_listener_image }}:{{ aodh_listener_tag }}" - -aodh_notifier_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-aodh-notifier" -aodh_notifier_tag: "{{ openstack_release }}" -aodh_notifier_image_full: "{{ aodh_notifier_image }}:{{ aodh_notifier_tag }}" - - -#################### -# OpenStack -#################### -aodh_admin_endpoint: "{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ aodh_api_port }}" -aodh_internal_endpoint: "{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ aodh_api_port }}" -aodh_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ aodh_api_port }}" - -aodh_logging_debug: "{{ openstack_logging_debug }}" - -aodh_keystone_user: "aodh" - -openstack_aodh_auth: "{'auth_url':'{{ openstack_auth.auth_url }}','username':'{{ openstack_auth.username }}','password':'{{ openstack_auth.password }}','project_name':'{{ openstack_auth.project_name }}','domain_name':'default'}" diff --git a/ansible/roles/aodh/meta/main.yml b/ansible/roles/aodh/meta/main.yml deleted file mode 100644 index 6b4fff8fe..000000000 --- a/ansible/roles/aodh/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: - - { role: common } diff --git a/ansible/roles/aodh/tasks/bootstrap.yml b/ansible/roles/aodh/tasks/bootstrap.yml deleted file mode 100644 index e532e899d..000000000 --- a/ansible/roles/aodh/tasks/bootstrap.yml +++ /dev/null @@ -1,41 +0,0 @@ ---- -- name: Creating aodh database - command: docker exec -t kolla_toolbox /usr/bin/ansible localhost - -m mysql_db - -a "login_host='{{ database_address }}' - login_port='{{ database_port }}' - login_user='{{ database_user }}' - login_password='{{ database_password }}' - name='{{ aodh_database_name }}'" - register: database - changed_when: "{{ database.stdout.find('localhost | SUCCESS => ') != -1 and - (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}" - failed_when: database.stdout.split()[2] != 'SUCCESS' - run_once: True - delegate_to: "{{ groups['aodh-api'][0] }}" - -- name: Reading json from variable - set_fact: - database_created: "{{ (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}" - -- name: Creating aodh database user and setting permissions - command: docker exec -t kolla_toolbox /usr/bin/ansible localhost - -m mysql_user - -a "login_host='{{ database_address }}' - login_port='{{ database_port }}' - login_user='{{ database_user }}' - login_password='{{ database_password }}' - name='{{ aodh_database_name }}' - password='{{ aodh_database_password }}' - host='%' - priv='{{ aodh_database_name }}.*:ALL' - append_privs='yes'" - register: database_user_create - changed_when: "{{ database_user_create.stdout.find('localhost | SUCCESS => ') != -1 and - (database_user_create.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}" - failed_when: database_user_create.stdout.split()[2] != 'SUCCESS' - run_once: True - delegate_to: "{{ groups['aodh-api'][0] }}" - -- include: bootstrap_service.yml - when: database_created diff --git a/ansible/roles/aodh/tasks/bootstrap_service.yml b/ansible/roles/aodh/tasks/bootstrap_service.yml deleted file mode 100644 index 5b3f0585c..000000000 --- a/ansible/roles/aodh/tasks/bootstrap_service.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -- name: Running aodh bootstrap container - kolla_docker: - action: "start_container" - common_options: "{{ docker_common_options }}" - detach: False - environment: - KOLLA_BOOTSTRAP: - KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" - image: "{{ aodh_api_image_full }}" - labels: - BOOTSTRAP: - name: "bootstrap_aodh" - restart_policy: "never" - volumes: - - "{{ node_config_directory }}/aodh-api/:{{ container_config_directory }}/:ro" - - "/etc/localtime:/etc/localtime:ro" - - "aodh:/var/lib/aodh/" - - "kolla_logs:/var/log/kolla/" - run_once: True - delegate_to: "{{ groups['aodh-api'][0] }}" diff --git a/ansible/roles/aodh/tasks/config.yml b/ansible/roles/aodh/tasks/config.yml deleted file mode 100644 index 971477aec..000000000 --- a/ansible/roles/aodh/tasks/config.yml +++ /dev/null @@ -1,63 +0,0 @@ ---- -- name: Ensuring config directories exist - file: - path: "{{ node_config_directory }}/{{ item }}" - state: "directory" - recurse: yes - with_items: - - "aodh-api" - - "aodh-evaluator" - - "aodh-listener" - - "aodh-notifier" - -- name: Copying over config.json files for services - template: - src: "{{ item }}.json.j2" - dest: "{{ node_config_directory }}/{{ item }}/config.json" - with_items: - - "aodh-api" - - "aodh-listener" - - "aodh-evaluator" - - "aodh-notifier" - -- name: Copying over aodh.conf - merge_configs: - vars: - service_name: "{{ item }}" - sources: - - "{{ role_path }}/templates/aodh.conf.j2" - - "{{ node_custom_config }}/global.conf" - - "{{ node_custom_config }}/database.conf" - - "{{ node_custom_config }}/messaging.conf" - - "{{ node_custom_config }}/aodh.conf" - - "{{ node_custom_config }}/aodh/{{ item }}.conf" - - "{{ node_custom_config }}/aodh/{{ inventory_hostname }}/{{ item }}.conf" - dest: "{{ node_config_directory }}/{{ item }}/aodh.conf" - with_items: - - "aodh-api" - - "aodh-evaluator" - - "aodh-listener" - - "aodh-notifier" - -- name: Copying over wsgi-aodh files for services - template: - src: "wsgi-aodh.conf.j2" - dest: "{{ node_config_directory }}/{{ item }}/wsgi-aodh.conf" - with_items: - - "aodh-api" - -- name: Check if policies shall be overwritten - local_action: stat path="{{ node_custom_config }}/aodh/policy.json" - register: aodh_policy - -- name: Copying over existing policy.json - template: - src: "{{ node_custom_config }}/aodh/policy.json" - dest: "{{ node_config_directory }}/{{ item }}/policy.json" - with_items: - - "aodh-api" - - "aodh-evaluator" - - "aodh-listener" - - "aodh-notifier" - when: - aodh_policy.stat.exists diff --git a/ansible/roles/aodh/tasks/deploy.yml b/ansible/roles/aodh/tasks/deploy.yml deleted file mode 100644 index bb4533fa0..000000000 --- a/ansible/roles/aodh/tasks/deploy.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -- include: register.yml - when: inventory_hostname in groups['aodh-api'] - -- include: config.yml - when: inventory_hostname in groups['aodh-api'] or - inventory_hostname in groups['aodh-evaluator'] or - inventory_hostname in groups['aodh-listener'] or - inventory_hostname in groups['aodh-notifier'] - -- include: bootstrap.yml - when: inventory_hostname in groups['aodh-api'] - -- include: start.yml - when: inventory_hostname in groups['aodh-api'] or - inventory_hostname in groups['aodh-evaluator'] or - inventory_hostname in groups['aodh-listener'] or - inventory_hostname in groups['aodh-notifier'] diff --git a/ansible/roles/aodh/tasks/main.yml b/ansible/roles/aodh/tasks/main.yml deleted file mode 100644 index b017e8b4a..000000000 --- a/ansible/roles/aodh/tasks/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -- include: "{{ action }}.yml" diff --git a/ansible/roles/aodh/tasks/precheck.yml b/ansible/roles/aodh/tasks/precheck.yml deleted file mode 100644 index ed97d539c..000000000 --- a/ansible/roles/aodh/tasks/precheck.yml +++ /dev/null @@ -1 +0,0 @@ ---- diff --git a/ansible/roles/aodh/tasks/pull.yml b/ansible/roles/aodh/tasks/pull.yml deleted file mode 100644 index dae4426a5..000000000 --- a/ansible/roles/aodh/tasks/pull.yml +++ /dev/null @@ -1,28 +0,0 @@ ---- -- name: Pulling aodh-api image - kolla_docker: - action: "pull_image" - common_options: "{{ docker_common_options }}" - image: "{{ aodh_api_image_full }}" - when: inventory_hostname in groups['aodh-api'] - -- name: Pulling aodh-listener image - kolla_docker: - action: "pull_image" - common_options: "{{ docker_common_options }}" - image: "{{ aodh_listener_image_full }}" - when: inventory_hostname in groups['aodh-listener'] - -- name: Pulling aodh-evaluator image - kolla_docker: - action: "pull_image" - common_options: "{{ docker_common_options }}" - image: "{{ aodh_evaluator_image_full }}" - when: inventory_hostname in groups['aodh-evaluator'] - -- name: Pulling aodh-notifier image - kolla_docker: - action: "pull_image" - common_options: "{{ docker_common_options }}" - image: "{{ aodh_notifier_image_full }}" - when: inventory_hostname in groups['aodh-notifier'] diff --git a/ansible/roles/aodh/tasks/reconfigure.yml b/ansible/roles/aodh/tasks/reconfigure.yml deleted file mode 100644 index c915b500d..000000000 --- a/ansible/roles/aodh/tasks/reconfigure.yml +++ /dev/null @@ -1,79 +0,0 @@ ---- -- name: Ensuring the containers up - kolla_docker: - name: "{{ item.name }}" - action: "get_container_state" - register: container_state - failed_when: container_state.Running == false - when: inventory_hostname in groups[item.group] - with_items: - - { name: aodh_api, group: aodh-api } - - { name: aodh_listener, group: aodh-listener } - - { name: aodh_evaluator, group: aodh-evaluator } - - { name: aodh_notifier, group: aodh-notifier } - -- include: config.yml - -- name: Check the configs - command: docker exec {{ item.name }} /usr/local/bin/kolla_set_configs --check - changed_when: false - failed_when: false - register: check_results - when: inventory_hostname in groups[item.group] - with_items: - - { name: aodh_api, group: aodh-api } - - { name: aodh_listener, group: aodh-listener } - - { name: aodh_evaluator, group: aodh-evaluator } - - { name: aodh_notifier, group: aodh-notifier } - -# NOTE(jeffrey4l): when config_strategy == 'COPY_ALWAYS' -# and container env['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE', -# just remove the container and start again -- name: Containers config strategy - kolla_docker: - name: "{{ item.name }}" - action: "get_container_env" - register: container_envs - when: inventory_hostname in groups[item.group] - with_items: - - { name: aodh_api, group: aodh-api } - - { name: aodh_listener, group: aodh-listener } - - { name: aodh_evaluator, group: aodh-evaluator } - - { name: aodh_notifier, group: aodh-notifier } - -- name: Remove the containers - kolla_docker: - name: "{{ item[0]['name'] }}" - action: "remove_container" - register: remove_containers - when: - - inventory_hostname in groups[item[0]['group']] - - config_strategy == "COPY_ONCE" or item[1]['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE' - - item[2]['rc'] == 1 - with_together: - - [{ name: aodh_api, group: aodh-api }, - { name: aodh_listener, group: aodh-listener }, - { name: aodh_evaluator, group: aodh-evaluator }, - { name: aodh_notifier, group: aodh-notifier }] - - "{{ container_envs.results }}" - - "{{ check_results.results }}" - -- include: start.yml - when: remove_containers.changed - -- name: Restart containers - kolla_docker: - name: "{{ item[0]['name'] }}" - action: "restart_container" - when: - - inventory_hostname in groups[item[0]['group']] - - config_strategy == 'COPY_ALWAYS' - - item[1]['KOLLA_CONFIG_STRATEGY'] != 'COPY_ONCE' - - item[2]['rc'] == 1 - with_together: - - [{ name: aodh_api, group: aodh-api }, - { name: aodh_listener, group: aodh-listener }, - { name: aodh_evaluator, group: aodh-evaluator }, - { name: aodh_notifier, group: aodh-notifier }] - - "{{ container_envs.results }}" - - "{{ check_results.results }}" diff --git a/ansible/roles/aodh/tasks/register.yml b/ansible/roles/aodh/tasks/register.yml deleted file mode 100644 index 202a11fff..000000000 --- a/ansible/roles/aodh/tasks/register.yml +++ /dev/null @@ -1,40 +0,0 @@ ---- -- name: Creating the aodh service and endpoint - command: docker exec -t kolla_toolbox /usr/bin/ansible localhost - -m kolla_keystone_service - -a "service_name=aodh - service_type=alarming - description='OpenStack Alarming Service' - endpoint_region={{ openstack_region_name }} - url='{{ item.url }}' - interface='{{ item.interface }}' - region_name={{ openstack_region_name }} - auth={{ '{{ openstack_aodh_auth }}' }}" - -e "{'openstack_aodh_auth':{{ openstack_aodh_auth }}}" - register: aodh_endpoint - changed_when: "{{ aodh_endpoint.stdout.find('localhost | SUCCESS => ') != -1 and (aodh_endpoint.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}" - until: aodh_endpoint.stdout.split()[2] == 'SUCCESS' - retries: 10 - delay: 5 - run_once: True - with_items: - - {'interface': 'admin', 'url': '{{ aodh_admin_endpoint }}'} - - {'interface': 'internal', 'url': '{{ aodh_internal_endpoint }}'} - - {'interface': 'public', 'url': '{{ aodh_public_endpoint }}'} - -- name: Creating the aodh project, user, and role - command: docker exec -t kolla_toolbox /usr/bin/ansible localhost - -m kolla_keystone_user - -a "project=service - user=aodh - password={{ aodh_keystone_password }} - role=admin - region_name={{ openstack_region_name }} - auth={{ '{{ openstack_aodh_auth }}' }}" - -e "{'openstack_aodh_auth':{{ openstack_aodh_auth }}}" - register: aodh_user - changed_when: "{{ aodh_user.stdout.find('localhost | SUCCESS => ') != -1 and (aodh_user.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}" - until: aodh_user.stdout.split()[2] == 'SUCCESS' - retries: 10 - delay: 5 - run_once: True diff --git a/ansible/roles/aodh/tasks/start.yml b/ansible/roles/aodh/tasks/start.yml deleted file mode 100644 index 408479919..000000000 --- a/ansible/roles/aodh/tasks/start.yml +++ /dev/null @@ -1,49 +0,0 @@ ---- -- name: Starting aodh-api container - kolla_docker: - action: "start_container" - common_options: "{{ docker_common_options }}" - image: "{{ aodh_api_image_full }}" - name: "aodh_api" - volumes: - - "{{ node_config_directory }}/aodh-api/:{{ container_config_directory }}/:ro" - - "/etc/localtime:/etc/localtime:ro" - - "aodh:/var/lib/aodh/" - - "kolla_logs:/var/log/kolla/" - when: inventory_hostname in groups['aodh-api'] - -- name: Starting aodh-evaluator container - kolla_docker: - action: "start_container" - common_options: "{{ docker_common_options }}" - image: "{{ aodh_evaluator_image_full }}" - name: "aodh_evaluator" - volumes: - - "{{ node_config_directory }}/aodh-evaluator/:{{ container_config_directory }}/:ro" - - "/etc/localtime:/etc/localtime:ro" - - "kolla_logs:/var/log/kolla/" - when: inventory_hostname in groups['aodh-evaluator'] - -- name: Starting aodh-listener container - kolla_docker: - action: "start_container" - common_options: "{{ docker_common_options }}" - image: "{{ aodh_listener_image_full }}" - name: "aodh_listener" - volumes: - - "{{ node_config_directory }}/aodh-listener/:{{ container_config_directory }}/:ro" - - "/etc/localtime:/etc/localtime:ro" - - "kolla_logs:/var/log/kolla/" - when: inventory_hostname in groups['aodh-listener'] - -- name: Starting aodh-notifier container - kolla_docker: - action: "start_container" - common_options: "{{ docker_common_options }}" - image: "{{ aodh_notifier_image_full }}" - name: "aodh_notifier" - volumes: - - "{{ node_config_directory }}/aodh-notifier/:{{ container_config_directory }}/:ro" - - "/etc/localtime:/etc/localtime:ro" - - "kolla_logs:/var/log/kolla/" - when: inventory_hostname in groups['aodh-notifier'] diff --git a/ansible/roles/aodh/tasks/upgrade.yml b/ansible/roles/aodh/tasks/upgrade.yml deleted file mode 100644 index 308053080..000000000 --- a/ansible/roles/aodh/tasks/upgrade.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- include: config.yml - -- include: bootstrap_service.yml - -- include: start.yml 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> |