openstack/tripleo-puppet-elements
Code Issues Proposed changes

Remove nova.conf truncate/refresh workaround

Browse Source 
truncate-nova-config was added as a workaround for the following
bug.

  Duplicate sections in generated config
  https://bugs.launchpad.net/oslo.config/+bug/1568820

This workaround is no longer needed, as the root causes are now
fixed in both nova and oslo-config.

This workaround is also unused, as it was recently changed and
accidentally installed in the wrong location (nested one level too
deep in configure.d, and maxdepth is 1 in dib-run-parts).

For example, compare configure.d/ in stable/newton vs master
(circa ocata), and note the path differences.

  newton: http://paste.openstack.org/show/601802/
  ocata: http://paste.openstack.org/show/601806/

  newton: configure.d/40-truncate-nova-config
  ocata: configure.d/40-truncate-nova-config/40-truncate-nova-config

But it was a happy accident because this workaround stripped the
comments from /etc/nova/nova.conf, but now they're back as of ocata.

Related-Bug: #1568820
Change-Id: Iddae03f2d66cf534908dad884af55e2ae7d18d4b
This commit is contained in:
Diana Clarke 2017-03-07 11:28:33 -05:00
parent a63d949ec3
commit 85f4604298
6 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
elements/hiera/element-deps
View File

@ -2,4 +2,3 @@ os-apply-config
os-refresh-config
package-installs
puppet
truncate-nova-config

14
elements/truncate-nova-config/40-truncate-nova-config
View File

@ -1,14 +0,0 @@
#!/bin/bash
set -eux
set -o pipefail
#FIXME: this is a workaround for https://bugs.launchpad.net/oslo.config/+bug/1568820
# truncate nova.conf to avoid the duplicate sections that break puppet-nova's
# nova_config resource
if [ -f /etc/nova/nova.conf ]; then
if [ ! -f /var/lib/nova-conf-truncated ]; then
cp /dev/null /etc/nova/nova.conf
touch /var/lib/nova-conf-truncated
fi
fi

1
elements/truncate-nova-config/README.md
View File

@ -1 +0,0 @@
Truncate config files.

1
elements/truncate-nova-config/element-deps
View File

@ -1 +0,0 @@
os-refresh-config

7
elements/truncate-nova-config/install.d/11-truncate-nova-orc-install
View File

@ -1,7 +0,0 @@
#!/bin/bash
set -eux
set -o pipefail
mkdir -p /usr/libexec/os-refresh-config/configure.d/40-truncate-nova-config
install -m 0755 -o root -g root $(dirname $0)/../40-truncate-nova-config /usr/libexec/os-refresh-config/configure.d/40-truncate-nova-config

8
releasenotes/notes/remove-truncate-nova-config-096eb019d328b2f7.yaml Normal file
View File

@ -0,0 +1,8 @@
---
other:
- |
Removed ``truncate-nova-config`` as it isn't being used anymore. It was
originally added as a workaround for `bug 1568820`_ which has since been
fixed in nova and oslo-config.
.. _bug 1568820: https://bugs.launchpad.net/oslo.config/+bug/1568820