openstack
/
openstack-ansible
Code Issues Proposed changes

Fixes a var dependency between Neutron and Octavia 

If Octavia's V1 API is activated (aka Octavia is not running
stand alone) Neutron needs to reach the Octavia API and is
using the variable to set up the URL in neutron.conf. Without this
configuring Neutron with Octavia support will fail.

Change-Id: I6dacbfc3dd9d6911b6707d067cf6e1aab64e0126
This commit is contained in:
German Eichberger 2017-10-24 11:44:11 -07:00
parent 1fe7d72139
commit 184eab7cdc
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
group_vars/all/octavia.yml Normal file
View File

@ -0,0 +1,22 @@
---
# Copyright 2017, Rackspace US, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
octavia_service_port: 9876
octavia_service_proto: http
octavia_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(octavia_service_proto) }}"
octavia_service_internaluri: "{{ octavia_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ octavia_service_port }}"
# this var below is referenced by neutron if Octavia is activated with V1 API
octavia_service_url: "{{ octavia_service_internaluri }}"

6
group_vars/octavia_all.yml
View File

@ -13,14 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
octavia_service_port: 9876
octavia_service_proto: http
octavia_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(octavia_service_proto) }}"
octavia_service_internaluri: "{{ octavia_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ octavia_service_port }}"
octavia_service_internalurl: "{{ octavia_service_internaluri }}/v1/%(tenant_id)s"
octavia_service_user_name: octavia
octavia_service_url: "{{ octavia_service_internaluri }}"
# RPC
octavia_rabbitmq_userid: octavia