openstack/kolla-ansible
Code Issues Proposed changes

Merge "Cinder: modernize nova config"

Browse Source
This commit is contained in:
Jenkins 2017-07-02 09:26:30 +00:00 committed by Gerrit Code Review
commit bb5ccf3d29
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/roles/cinder/templates/cinder.conf.j2
View File

@ -51,7 +51,6 @@ osapi_volume_listen = {{ api_interface_address }}
osapi_volume_listen_port = {{ cinder_api_port }} osapi_volume_listen_port = {{ cinder_api_port }}
api_paste_config = /etc/cinder/api-paste.ini api_paste_config = /etc/cinder/api-paste.ini
nova_catalog_info = compute:nova:internalURL
auth_strategy = keystone auth_strategy = keystone
@ -65,6 +64,11 @@ topics = notifications
driver = noop driver = noop
{% endif %} {% endif %}
[nova]
region_name = {{ openstack_region_name }}
interface = internal
token_auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}
[database] [database]
connection = mysql+pymysql://{{ cinder_database_user }}:{{ cinder_database_password }}@{% if orchestration_engine == 'KUBERNETES' %}{{ cinder_database_address }}{% else %}{{ cinder_database_address }}{% endif %}/{{ cinder_database_name }} connection = mysql+pymysql://{{ cinder_database_user }}:{{ cinder_database_password }}@{% if orchestration_engine == 'KUBERNETES' %}{{ cinder_database_address }}{% else %}{{ cinder_database_address }}{% endif %}/{{ cinder_database_name }}
max_retries = -1 max_retries = -1