Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Use network-based fqdn entry from hiera instead of the custom fact
[apex-tripleo-heat-templates.git]
/
puppet
/
manifests
/
overcloud_controller_pacemaker.pp
diff --git
a/puppet/manifests/overcloud_controller_pacemaker.pp
b/puppet/manifests/overcloud_controller_pacemaker.pp
index
0aec972
..
d329d5f
100644
(file)
--- a/
puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/
puppet/manifests/overcloud_controller_pacemaker.pp
@@
-13,20
+13,9
@@
# License for the specific language governing permissions and limitations
# under the License.
# License for the specific language governing permissions and limitations
# under the License.
-include ::tripleo::packages
-include ::tripleo::firewall
-
-if $::hostname == downcase(hiera('bootstrap_nodeid')) {
- $pacemaker_master = true
- $sync_db = true
-} else {
- $pacemaker_master = false
- $sync_db = false
+if hiera('step') >= 4 {
+ hiera_include('controller_classes', [])
}
}
-if hiera('step') >= 4 or ( hiera('step') >= 3 and $sync_db ) {
- hiera_include('controller_classes')
-} #END STEP 4
-
$package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_controller_pacemaker', hiera('step')])
package_manifest{$package_manifest_name: ensure => present}
$package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_controller_pacemaker', hiera('step')])
package_manifest{$package_manifest_name: ensure => present}