d12465b4a0
While rebasing puppet-rabbitmq due to other reasons, I noticed that the
undercloud (re) deploy would fail with:
2019-05-31 09:59:00,919 INFO: Error: Evaluation Error: Error while evaluating a Resource Statement, Evaluation Error: Error while evaluating a Resource Statement, Duplicate declaration: Exec[systemctl-daemon-reload] is already declared in file /etc/puppet/manifests/puppet-stack-config.pp:99; cannot redeclare at /etc/puppet/modules/systemd/manifests/systemctl/daemon_reload.pp:5 at /etc/puppet/modules/systemd/manifests/systemctl/daemon_reload.pp:5:3 at /etc/puppet/modules/rabbitmq/manifests/config.pp:231 on node undercloud-0.redhat.local
2019-05-31 09:59:00,982 INFO: + rc=1
This is because a newer puppet-rabbitmq introduced:
+
+ if $::facts['systemd'] {
+ Class['systemd::systemctl::daemon_reload'] -> Service['rabbitmq-server']
+ }
}
Which then pulls in the exec called 'systemctl-daemon-reload' from the
systemd module which conflicts with the same call we do in undercloud
puppet manifest.
Let's just rename this exact to 'systemctl-daemon-undercloud' so we do
not duplicate this resource ever. Tested this on a queens undercloud
with a puppet-rabbitmq that triggers the problematic exec and got a
correctly redeployed undercloud.
We could have used the systemd module instead but that might require
other backports and this seems the smallest possible approach to solve
this.
Change-Id: I96f5e4e51947da6919724d8ffb8531b8ecf87ff8
Closes-Bug: #1831253
|
||
|---|---|---|
| config-generator | ||
| doc/source | ||
| elements | ||
| imagefactory | ||
| instack_undercloud | ||
| json-files | ||
| releasenotes | ||
| scripts | ||
| templates | ||
| tools | ||
| zuul.d | ||
| .coveragerc | ||
| .gitignore | ||
| .gitreview | ||
| .testr.conf | ||
| Gemfile | ||
| LICENSE | ||
| README.md | ||
| Rakefile | ||
| bindep.txt | ||
| requirements.txt | ||
| setup.cfg | ||
| setup.py | ||
| test-requirements.txt | ||
| tox.ini | ||
| undercloud.conf.sample | ||
README.md
Team and repository tags
Undercloud Install via instack
instack-undercloud is tooling for installing a TripleO undercloud.
It is part of the TripleO project: https://docs.openstack.org/developer/tripleo-docs/index.html
- Free software: Apache license
- Source: https://git.openstack.org/cgit/openstack/instack-undercloud
- Bugs: https://bugs.launchpad.net/tripleo