From 84738f062d9591257b76cedff756cb17165eb2f7 Mon Sep 17 00:00:00 2001 From: Bertrand Lallau Date: Thu, 29 Jun 2017 16:50:30 +0200 Subject: [PATCH] Cinder: modernize nova config As describe here: https://github.com/openstack/cinder/blob/master/cinder/compute/nova.py#L42 * remove 'nova_catalog_info' deprecated option * add new [nova] section Change-Id: Ib89a589c8eb8d81839bd4d07d7174b3272136934 --- ansible/roles/cinder/templates/cinder.conf.j2 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ansible/roles/cinder/templates/cinder.conf.j2 b/ansible/roles/cinder/templates/cinder.conf.j2 index 038ea4c733..44803fc4d0 100644 --- a/ansible/roles/cinder/templates/cinder.conf.j2 +++ b/ansible/roles/cinder/templates/cinder.conf.j2 @@ -51,7 +51,6 @@ osapi_volume_listen = {{ api_interface_address }} osapi_volume_listen_port = {{ cinder_api_port }} api_paste_config = /etc/cinder/api-paste.ini -nova_catalog_info = compute:nova:internalURL auth_strategy = keystone @@ -65,6 +64,11 @@ topics = notifications driver = noop {% endif %} +[nova] +region_name = {{ openstack_region_name }} +interface = internal +token_auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }} + [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 }} max_retries = -1