diff options
| -rw-r--r-- | ansible/roles/mistral/defaults/main.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/mistral/tasks/config.yml | 15 | ||||
| -rw-r--r-- | ansible/roles/mistral/templates/mistral-api.json.j2 | 8 | ||||
| -rw-r--r-- | ansible/roles/mistral/templates/mistral.conf.j2 | 4 |
4 files changed, 26 insertions, 2 deletions
diff --git a/ansible/roles/mistral/defaults/main.yml b/ansible/roles/mistral/defaults/main.yml index f4d9d14ef..0bb575590 100644 --- a/ansible/roles/mistral/defaults/main.yml +++ b/ansible/roles/mistral/defaults/main.yml @@ -8,6 +8,7 @@ mistral_services: volumes: "{{ mistral_api_default_volumes + mistral_api_extra_volumes }}" dimensions: "{{ mistral_api_dimensions }}" healthcheck: "{{ mistral_api_healthcheck }}" + wsgi: "mistral.wsgi:application" haproxy: mistral_api: enabled: "{{ enable_mistral }}" diff --git a/ansible/roles/mistral/tasks/config.yml b/ansible/roles/mistral/tasks/config.yml index 06707f727..f0164c9da 100644 --- a/ansible/roles/mistral/tasks/config.yml +++ b/ansible/roles/mistral/tasks/config.yml @@ -41,6 +41,21 @@ become: true with_dict: "{{ mistral_services | select_services_enabled_and_mapped_to_host }}" +- name: "Configure uWSGI for mistral-api" + ansible.builtin.include_role: + name: service-uwsgi-config + vars: + project_services: "{{ mistral_services }}" + service: "{{ mistral_services['mistral-api'] }}" + service_name: "mistral-api" + service_uwsgi_config_http_port: "{{ mistral_api_listen_port }}" + service_uwsgi_config_log_file_chmod: "644" + service_uwsgi_config_module: "{{ service.wsgi }}" + service_uwsgi_config_uid: "mistral" + service_uwsgi_config_workers: "{{ mistral_api_workers }}" + when: + - service | service_enabled_and_mapped_to_host + - name: Copying over mistral.conf vars: service_name: "{{ item.key }}" diff --git a/ansible/roles/mistral/templates/mistral-api.json.j2 b/ansible/roles/mistral/templates/mistral-api.json.j2 index c92e8c47c..c057acdca 100644 --- a/ansible/roles/mistral/templates/mistral-api.json.j2 +++ b/ansible/roles/mistral/templates/mistral-api.json.j2 @@ -1,11 +1,17 @@ { - "command": "mistral-server --server api --config-file /etc/mistral/mistral.conf", + "command": "uwsgi /etc/mistral/mistral-api-uwsgi.ini", "config_files": [ { "source": "{{ container_config_directory }}/mistral.conf", "dest": "/etc/mistral/mistral.conf", "owner": "mistral", "perm": "0600" + }, + { + "source": "{{ container_config_directory }}/mistral-api-uwsgi.ini", + "dest": "/etc/mistral/mistral-api-uwsgi.ini", + "owner": "mistral", + "perm": "0600" }{% if mistral_policy_file is defined %}, { "source": "{{ container_config_directory }}/{{ mistral_policy_file }}", diff --git a/ansible/roles/mistral/templates/mistral.conf.j2 b/ansible/roles/mistral/templates/mistral.conf.j2 index 548200bb2..aeb2dab9d 100644 --- a/ansible/roles/mistral/templates/mistral.conf.j2 +++ b/ansible/roles/mistral/templates/mistral.conf.j2 @@ -2,7 +2,9 @@ debug = {{ mistral_logging_debug }} log_dir = /var/log/kolla/mistral -{% if service_name == 'mistral-engine' %} +{% if service_name == 'mistral-api' %} +log_file = /var/log/kolla/mistral/mistral-api.log +{% elif service_name == 'mistral-engine' %} log_file = /var/log/kolla/mistral/mistral-engine.log {% elif service_name == 'mistral-event-engine' %} log_file = /var/log/kolla/mistral/mistral-event-engine.log |