From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 7 Jul 2015 06:55:22 +0000 (+0000)
Subject: Merge "Allow customization of included classes via hieradata"
X-Git-Tag: opnfv-6.0.0~2451
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=0bbf34a21b1eecdfdf1bacc14ea0b93edbbd2435;p=apex-tripleo-heat-templates.git

Merge "Allow customization of included classes via hieradata"
---

0bbf34a21b1eecdfdf1bacc14ea0b93edbbd2435
diff --cc puppet/manifests/overcloud_compute.pp
index cc26f851,92171e87..67a73dda
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@@ -88,3 -88,5 +88,5 @@@ class { 'snmp'
    agentaddress => ['udp:161','udp6:[::1]:161'],
    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('compute_classes')
++hiera_include('compute_classes')