Merge "Allow customization of included classes via hieradata"

puppet/hieradata/ceph.yaml

@@ -11,3 +11,5 @@ ceph_pools:
   - volumes
   - vms
   - images
+
+ceph_classes: []

puppet/hieradata/compute.yaml

@@ -16,3 +16,5 @@ nova::compute::rbd::libvirt_images_rbd_pool: 'vms'
 nova::compute::rbd::libvirt_rbd_secret_uuid: "%{hiera('ceph::profile::params::fsid')}"
 
 ceilometer::agent::auth::auth_tenant_name: 'service'
+
+compute_classes: []

puppet/hieradata/controller.yaml

@@ -111,3 +111,5 @@ tripleo::loadbalancer::heat_api: true
 tripleo::loadbalancer::heat_cloudwatch: true
 tripleo::loadbalancer::heat_cfn: true
 tripleo::loadbalancer::horizon: true
+
+controller_classes: []

puppet/hieradata/object.yaml

@@ -14,3 +14,5 @@ swift::proxy::keystone::operator_roles:
   - admin
   - swiftoperator
   - ResellerAdmin
+
+object_classes: []

puppet/hieradata/volume.yaml

@@ -2,3 +2,5 @@
 
 # cinder
 cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterScheduler
+
+volume_classes: []

puppet/manifests/overcloud_cephstorage.pp

@@ -31,4 +31,6 @@ if count(hiera('ntp::servers')) > 0 {
 }
 
 include ::ceph::profile::client
-include ::ceph::profile::osd
+include ::ceph::profile::osd
+
+hiera_include('ceph_classes')

puppet/manifests/overcloud_compute.pp

@@ -88,3 +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')

puppet/manifests/overcloud_controller.pp

@@ -438,4 +438,6 @@ 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

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 {

puppet/manifests/overcloud_object.pp

@@ -56,3 +56,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('object_classes')

puppet/manifests/overcloud_volume.pp

@@ -59,3 +59,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('volume_classes')