diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-07-07 06:55:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-07-07 06:55:22 +0000 |
| commit | 0bbf34a21b1eecdfdf1bacc14ea0b93edbbd2435 (patch) | |
| tree | 91260459998d823c13f06b4eb7458e0aade3f44d /puppet/manifests/overcloud_controller_pacemaker.pp | |
| parent | bca9e7fa9f18a436b0840f17454516c8a10f36fd (diff) | |
| parent | e8c641372ea2c6a0367f03fb01d758827e9f68d3 (diff) | |
Merge "Allow customization of included classes via hieradata"
Diffstat (limited to 'puppet/manifests/overcloud_controller_pacemaker.pp')
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 3b5b8fe4..582e29ef 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -845,6 +845,8 @@ if hiera('step') >= 3 { snmpd_config => [ join(['rouser ', hiera('snmpd_readonly_user_name')]), 'proc cron', 'includeAllDisks 10%', 'master agentx', 'trapsink localhost public', 'iquerySecName internalUser', 'rouser internalUser', 'defaultMonitors yes', 'linkUpDownNotifications yes' ], } + hiera_include('controller_classes') + } #END STEP 3 if hiera('step') >= 4 { |