From f70e186285b17ad5363af2dfe0014504af1c958d Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Tue, 22 Feb 2022 20:50:41 +0000 Subject: [PATCH] Use [database]/connection in templates nova-manage uses the [database]/connection to determine the database connection. This change updates the nova.conf template to use the parts/section-database template, switching away from using [DEFAULT]/sql_connection to use [database]/connection instead. [DEFAULT/sql_connection has been deprecated since at least mitaka: https://docs.openstack.org/nova/mitaka/sample_config.html This change also re-enables the gate tests for Xena. Closes-Bug: #1951874 Change-Id: I9d77b44ad3c40f3ee60fedc3f211f3ac085fcbb2 --- osci.yaml | 12 +----------- src/templates/mitaka/nova.conf | 2 +- src/templates/pike/nova.conf | 2 +- src/templates/train/nova.conf | 2 +- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/osci.yaml b/osci.yaml index 55d0e27..eb6dc77 100644 --- a/osci.yaml +++ b/osci.yaml @@ -2,18 +2,8 @@ templates: - charm-unit-jobs-py38 - charm-unit-jobs-py39 - # focal-xena fails due to: - # https://bugs.launchpad.net/charm-nova-cell-controller/+bug/1951874 - # - charm-xena-functional-jobs + - charm-xena-functional-jobs - charm-yoga-functional-jobs - check: - jobs: - # focal-xena fails due to: - # https://bugs.launchpad.net/charm-nova-cell-controller/+bug/1951874 - - focal-xena: - voting: false - - impish-xena: - voting: false vars: needs_charm_build: true charm_build_name: nova-cell-controller diff --git a/src/templates/mitaka/nova.conf b/src/templates/mitaka/nova.conf index 5ef0626..0736b6b 100644 --- a/src/templates/mitaka/nova.conf +++ b/src/templates/mitaka/nova.conf @@ -10,7 +10,7 @@ logdir=/var/log/nova state_path=/var/lib/nova root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf -{% include "parts/database" %} +{% include "parts/section-database" %} [conductor] workers = {{ options.workers }} diff --git a/src/templates/pike/nova.conf b/src/templates/pike/nova.conf index 167d2c9..0a3fa7b 100644 --- a/src/templates/pike/nova.conf +++ b/src/templates/pike/nova.conf @@ -12,7 +12,7 @@ root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf {% include "parts/section-transport-url" %} -{% include "parts/database" %} +{% include "parts/section-database" %} [conductor] workers = {{ options.workers }} diff --git a/src/templates/train/nova.conf b/src/templates/train/nova.conf index b65bfd2..cd7a348 100644 --- a/src/templates/train/nova.conf +++ b/src/templates/train/nova.conf @@ -12,7 +12,7 @@ root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf {% include "parts/section-transport-url" %} -{% include "parts/database" %} +{% include "parts/section-database" %} [conductor] workers = {{ options.workers }}