From ce5973a76a0e7091f6d5d5fdc48dd81b69bc2046 Mon Sep 17 00:00:00 2001 From: Edward Hope-Morley Date: Fri, 26 Oct 2018 16:08:56 +0100 Subject: [PATCH] Make Queens and Rocky share same conf template The original patch for this bug fixed the problem for rocky only but queens also suffers from the same problem. Since the only diff between the P and R templates is this change, move it into Q so that Q and R will both get the fix. Change-Id: Ib4573aa925cb1b3b9e1fa04e8a3c5bf611223c25 Related-Bug: #1788631 (cherry picked from commit 31a7dd32d76394210e53ca36d3fc1fbd210ee368) --- templates/{rocky => queens}/neutron.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename templates/{rocky => queens}/neutron.conf (99%) diff --git a/templates/rocky/neutron.conf b/templates/queens/neutron.conf similarity index 99% rename from templates/rocky/neutron.conf rename to templates/queens/neutron.conf index df55927a..774942b0 100644 --- a/templates/rocky/neutron.conf +++ b/templates/queens/neutron.conf @@ -1,4 +1,4 @@ -# rocky +# queens ############################################################################### # [ WARNING ] # Configuration file maintained by Juju. Local changes may be overwritten.