From c11d578700489500dfc9b63bdd70a2e583337377 Mon Sep 17 00:00:00 2001 From: Natalia Litvinova <natalia.litvinova@canonical.com> Date: Wed, 25 Sep 2019 11:16:28 +0300 Subject: [PATCH] Replacing deprecated 'api_paste_config' option Replacing deprecated 'api_paste_config' option from group 'DEFAULT' with 'api_paste_config' option from group 'wsgi'. The configuration was moved to [wsgi] group in Newton: https://opendev.org/openstack/nova/src/commit/0b9e378cca2be4e034ad401d71fbe4470907f93a/nova/conf/wsgi.py#L22 Change-Id: I45f4d079656616531f60fef2ba8b76bd301435f9 Closes-bug: #1837133 --- templates/newton/nova.conf | 4 +++- templates/ocata/nova.conf | 4 +++- templates/pike/nova.conf | 4 +++- templates/queens/nova.conf | 4 +++- templates/rocky/nova.conf | 3 ++- templates/stein/nova.conf | 3 ++- 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/templates/newton/nova.conf b/templates/newton/nova.conf index f81bf5d4..709036fe 100644 --- a/templates/newton/nova.conf +++ b/templates/newton/nova.conf @@ -16,7 +16,6 @@ state_path=/var/lib/nova force_dhcp_release=True use_syslog = {{ use_syslog }} ec2_private_dns_show_ip=True -api_paste_config=/etc/nova/api-paste.ini enabled_apis=osapi_compute,metadata auth_strategy=keystone my_ip = {{ host_ip }} @@ -252,3 +251,6 @@ disable_libvirt_livesnapshot = False {% include "parts/section-ephemeral" %} {% include "parts/section-serial-console" %} + +[wsgi] +api_paste_config=/etc/nova/api-paste.ini diff --git a/templates/ocata/nova.conf b/templates/ocata/nova.conf index 227e4f97..0c90e356 100644 --- a/templates/ocata/nova.conf +++ b/templates/ocata/nova.conf @@ -16,7 +16,6 @@ state_path=/var/lib/nova force_dhcp_release=True use_syslog = {{ use_syslog }} ec2_private_dns_show_ip=True -api_paste_config=/etc/nova/api-paste.ini enabled_apis=osapi_compute,metadata auth_strategy=keystone my_ip = {{ host_ip }} @@ -266,3 +265,6 @@ disable_libvirt_livesnapshot = False {% include "parts/section-serial-console" %} {% include "parts/section-placement" %} + +[wsgi] +api_paste_config=/etc/nova/api-paste.ini diff --git a/templates/pike/nova.conf b/templates/pike/nova.conf index c5be711b..0148c613 100644 --- a/templates/pike/nova.conf +++ b/templates/pike/nova.conf @@ -16,7 +16,6 @@ state_path=/var/lib/nova force_dhcp_release=True use_syslog = {{ use_syslog }} ec2_private_dns_show_ip=True -api_paste_config=/etc/nova/api-paste.ini enabled_apis=osapi_compute,metadata auth_strategy=keystone my_ip = {{ host_ip }} @@ -281,3 +280,6 @@ disable_libvirt_livesnapshot = False {% include "parts/section-serial-console" %} {% include "parts/section-placement" %} + +[wsgi] +api_paste_config=/etc/nova/api-paste.ini diff --git a/templates/queens/nova.conf b/templates/queens/nova.conf index 4e832b20..4a175193 100644 --- a/templates/queens/nova.conf +++ b/templates/queens/nova.conf @@ -16,7 +16,6 @@ state_path=/var/lib/nova force_dhcp_release=True use_syslog = {{ use_syslog }} ec2_private_dns_show_ip=True -api_paste_config=/etc/nova/api-paste.ini enabled_apis=osapi_compute,metadata auth_strategy=keystone my_ip = {{ host_ip }} @@ -292,3 +291,6 @@ disable_libvirt_livesnapshot = False {% include "parts/section-serial-console" %} {% include "parts/section-placement" %} + +[wsgi] +api_paste_config=/etc/nova/api-paste.ini diff --git a/templates/rocky/nova.conf b/templates/rocky/nova.conf index 063f2ae0..301034c8 100644 --- a/templates/rocky/nova.conf +++ b/templates/rocky/nova.conf @@ -16,7 +16,6 @@ state_path=/var/lib/nova force_dhcp_release=True use_syslog = {{ use_syslog }} ec2_private_dns_show_ip=True -api_paste_config=/etc/nova/api-paste.ini enabled_apis=osapi_compute,metadata auth_strategy=keystone my_ip = {{ host_ip }} @@ -304,3 +303,5 @@ disable_libvirt_livesnapshot = False cpu_shared_set = {{ cpu_shared_set }} {% endif -%} +[wsgi] +api_paste_config=/etc/nova/api-paste.ini diff --git a/templates/stein/nova.conf b/templates/stein/nova.conf index c3c6eb3b..6029e6e9 100644 --- a/templates/stein/nova.conf +++ b/templates/stein/nova.conf @@ -16,7 +16,6 @@ state_path=/var/lib/nova force_dhcp_release=True use_syslog = {{ use_syslog }} ec2_private_dns_show_ip=True -api_paste_config=/etc/nova/api-paste.ini enabled_apis=osapi_compute,metadata auth_strategy=keystone my_ip = {{ host_ip }} @@ -308,3 +307,5 @@ disable_libvirt_livesnapshot = False cpu_shared_set = {{ cpu_shared_set }} {% endif -%} +[wsgi] +api_paste_config=/etc/nova/api-paste.ini