From b745d0a6dde27d5f4866870200cacf2165e0e1d3 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Thu, 14 Sep 2017 15:22:00 +0800
Subject: [PATCH] `bind_host` and `bind_port` are coming under `api_setting

Option 'bind_host' from group 'DEFAULT' is deprecated for removal[0],
please use option 'bind_host' from group 'api_settings' instead. bind_port
option are the same.
The default value of api_handler is queue_producer, we did not configure
it. So delete api_handler option.

[0]https://github.com/openstack/octavia/blob/master/octavia/common/config.py#L45

Change-Id: I4e9c1d40bcb497f147ea38d4f3c6d78c181fa20b
Closes-Bug: #1717190
---
 ansible/roles/octavia/templates/octavia.conf.j2 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ansible/roles/octavia/templates/octavia.conf.j2 b/ansible/roles/octavia/templates/octavia.conf.j2
index e18fccd1b6..a980bec2a1 100644
--- a/ansible/roles/octavia/templates/octavia.conf.j2
+++ b/ansible/roles/octavia/templates/octavia.conf.j2
@@ -3,10 +3,9 @@ debug = {{ octavia_logging_debug }}
 
 log_dir = /var/log/kolla/octavia
 
-api_handler = queue_producer
-
 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_settings]
 bind_host = {{ api_interface_address }}
 bind_port = {{ octavia_api_port }}