Merge "Fix config typo (api_paste_confg)" into main

2025-07-23 02:15:10 +00:00
parent ccd9791a91 728609d5cf
commit b8f9638044
8 changed files with 0 additions and 9 deletions
--- a/charms/aodh-k8s/src/templates/aodh.conf.j2
+++ b/charms/aodh-k8s/src/templates/aodh.conf.j2
@@ -1,6 +1,5 @@
 [DEFAULT]
 debug = {{ options.debug }}
-api_paste_confg = /etc/aodh/api-paste.ini

 {% if amqp.transport_url -%}
 transport_url = {{ amqp.transport_url }}
--- a/charms/barbican-k8s/src/templates/barbican.conf
+++ b/charms/barbican-k8s/src/templates/barbican.conf
@@ -2,7 +2,6 @@
 debug = {{ options.debug }}
 lock_path = /var/lock/barbican
 state_path = /var/lib/barbican
-api_paste_confg = /etc/barbican/barbican-api-paste.ini

 host_href = ""
 transport_url = {{ amqp.transport_url }}
--- a/charms/cinder-ceph-k8s/src/templates/cinder.conf.j2
+++ b/charms/cinder-ceph-k8s/src/templates/cinder.conf.j2
@@ -5,7 +5,6 @@
 ###############################################################################
 [DEFAULT]
 rootwrap_config = /etc/cinder/rootwrap.conf
-api_paste_confg = /etc/cinder/api-paste.ini
 debug = {{ options.debug }}
 use_syslog = {{ options.use_syslog }}
 auth_strategy = keystone
--- a/charms/cinder-k8s/src/templates/cinder.conf.j2
+++ b/charms/cinder-k8s/src/templates/cinder.conf.j2
@@ -5,7 +5,6 @@
 ###############################################################################
 [DEFAULT]
 rootwrap_config = /etc/cinder/rootwrap.conf
-api_paste_confg = /etc/cinder/api-paste.ini
 debug = {{ options.debug }}
 transport_url = {{ amqp.transport_url }}
 auth_strategy = keystone
--- a/charms/designate-k8s/src/templates/designate.conf.j2
+++ b/charms/designate-k8s/src/templates/designate.conf.j2
@@ -2,7 +2,6 @@
 debug = {{ options.debug }}
 lock_path = /var/lock/designate
 state_path = /var/lib/designate
-api_paste_confg = /etc/designate/api-paste.ini

 transport_url = {{ amqp.transport_url }}

--- a/charms/gnocchi-k8s/src/templates/gnocchi.conf.j2
+++ b/charms/gnocchi-k8s/src/templates/gnocchi.conf.j2
@@ -1,6 +1,5 @@
 [DEFAULT]
 debug = {{ options.debug }}
-api_paste_confg = /etc/gnocchi/api-paste.ini

 [api]
 auth_mode = keystone
--- a/charms/masakari-k8s/src/templates/masakari.conf.j2
+++ b/charms/masakari-k8s/src/templates/masakari.conf.j2
@@ -3,8 +3,6 @@
 debug = {{ options.debug }}
 auth_strategy = keystone

-api_paste_confg = /etc/masakari/api-paste.ini
-
 {% if amqp.transport_url -%}
 transport_url = {{ amqp.transport_url }}
 {% endif -%}
--- a/charms/nova-k8s/src/templates/nova.conf.j2
+++ b/charms/nova-k8s/src/templates/nova.conf.j2
@@ -2,7 +2,6 @@
 lock_path = /var/lock/nova
 state_path = /var/lib/nova
 debug = {{ options.debug }}
-api_paste_confg = /etc/nova/api-paste.ini

 transport_url = {{ amqp.transport_url }}