From b479bd757be1960091f98cba42959815555ff1e2 Mon Sep 17 00:00:00 2001 From: Albert Mikaelyan Date: Fri, 2 Mar 2018 17:45:19 +0200 Subject: [PATCH] Use octavia_service_internaluri instead of url We were setting octavia v1 url in group_vars, but this url is the same as octavia v2 internal uri. So no need to create an additional variable for that, and instead we'll use the available uri variable. Change-Id: I6fa28dcdb251da4592e10b288d15a208e83b097d --- templates/neutron.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/neutron.conf.j2 b/templates/neutron.conf.j2 index a4f0e734..aee8e229 100644 --- a/templates/neutron.conf.j2 +++ b/templates/neutron.conf.j2 @@ -211,7 +211,7 @@ service_provider = {{ neutron_vpnaas_service_provider }} {% if neutron_lbaasv2 | bool %} {% if neutron_lbaas_octavia | bool %} [octavia] -base_url= {{ octavia_service_url }} +base_url= {{ octavia_service_internaluri }} request_poll_timeout = {{ neutron_octavia_request_poll_timeout }} {% endif %}