Merge "Allow customization of included classes via hieradata"

diff --cc puppet/manifests/overcloud_compute.pp
index cc26f85,92171e8..67a73dd
--- 1/puppet/manifests/overcloud_compute.pp
--- 2/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')

diff --cc puppet/manifests/overcloud_controller.pp
Simple merge

diff --cc puppet/manifests/overcloud_controller_pacemaker.pp
Simple merge