From 5fa29f6f067317cf4c0e4c3aa3eecfe4dd648c34 Mon Sep 17 00:00:00 2001 From: Eduardo Gonzalez Date: Mon, 26 Jun 2017 17:58:24 +0200 Subject: [PATCH] Fix mistral coordination Depends-On: Ic0269d0db10624925e7bcdbf0e33ae87b84a9cf2 Change-Id: I11dc911aba7c0dde1bf9b283f0a55925f0a2f353 Closes-Bug: #1700591 --- .../roles/mistral/templates/mistral.conf.j2 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/ansible/roles/mistral/templates/mistral.conf.j2 b/ansible/roles/mistral/templates/mistral.conf.j2 index 6c409a065d..f8fda58d0b 100644 --- a/ansible/roles/mistral/templates/mistral.conf.j2 +++ b/ansible/roles/mistral/templates/mistral.conf.j2 @@ -2,6 +2,11 @@ debug = {{ mistral_logging_debug }} log_dir = /var/log/kolla/mistral +{% if service_name == 'mistral-engine' %} +log_file = /var/log/kolla/mistral/mistral-engine.log +{% elif service_name == 'mistral-executor' %} +log_file = /var/log/kolla/mistral/mistral-executor.log +{% endif %} # NOTE(elemoine): set use_stderr to False or the logs will also be sent to # stderr and collected by Docker @@ -14,6 +19,12 @@ transport_url = rabbit://{% for host in groups['rabbitmq'] %}{{ rabbitmq_user }} host = {{ api_interface_address }} port = {{ mistral_api_port }} api_workers = {{ openstack_service_workers }} +{% elif service_name == 'mistral-engine' %} +[engine] +host = {{ api_interface_address }} +{% elif service_name == 'mistral-executor' %} +[executor] +host = {{ api_interface_address }} {% endif %} [database] @@ -38,6 +49,10 @@ memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansi [mistral] url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ mistral_api_port }} +[openstack_actions] +os_actions_endpoint_type = internal +default_region = {{ openstack_region_name }} + [oslo_messaging_notifications] driver = noop @@ -50,3 +65,6 @@ hmac_keys = {{ osprofiler_secret }} connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }} {% endif %} {% endif %} + +[coordination] +backend_url = redis://{% for host in groups['redis'] %}{% if host == groups['redis'][0] %}admin:{{ redis_master_password }}@{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ redis_sentinel_port }}?sentinel=kolla{% else %}&sentinel_fallback={{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ redis_sentinel_port }}{% endif %}{% endfor %}