Allow customization of included classes via hieradata

Allows inclusion of additional arbitrary puppet classes by the
manifests if defined in the *_classes hieradata.

Example: to specify the Nova RAM allocation ratio there is a
param in nova::scheduler::filter but we do not include it
by default; if needed one can use:

  nova::scheduler::filter::ram_allocation_ratio: 1.8
  controller_classes:
    - nova::scheduler::filter

Change-Id: I61d64d2498bed5c49376dee917d106598392db51

diff --git a/puppet/hieradata/ceph.yaml b/puppet/hieradata/ceph.yaml
index 280457d..6eb0e67 100644 (file)
--- a/puppet/hieradata/ceph.yaml
+++ b/puppet/hieradata/ceph.yaml
@@ -11,3 +11,5 @@ ceph_pools:
   - volumes
   - vms
   - images
+
+ceph_classes: []
\ No newline at end of file

diff --git a/puppet/hieradata/compute.yaml b/puppet/hieradata/compute.yaml
index 4915d3c..63a3473 100644 (file)
--- a/puppet/hieradata/compute.yaml
+++ b/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: []
\ No newline at end of file

diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 3de9bd9..eb45ee1 100644 (file)
--- a/puppet/hieradata/controller.yaml
+++ b/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: []
\ No newline at end of file

diff --git a/puppet/hieradata/object.yaml b/puppet/hieradata/object.yaml
index 59a8b1c..3a37903 100644 (file)
--- a/puppet/hieradata/object.yaml
+++ b/puppet/hieradata/object.yaml
@@ -14,3 +14,5 @@ swift::proxy::keystone::operator_roles:
   - admin
   - swiftoperator
   - ResellerAdmin
+
+object_classes: []
\ No newline at end of file

diff --git a/puppet/hieradata/volume.yaml b/puppet/hieradata/volume.yaml
index ad9e2c2..9f3907e 100644 (file)
--- a/puppet/hieradata/volume.yaml
+++ b/puppet/hieradata/volume.yaml
@@ -2,3 +2,5 @@
 
 # cinder
 cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterScheduler
+
+volume_classes: []
\ No newline at end of file

diff --git a/puppet/manifests/overcloud_cephstorage.pp b/puppet/manifests/overcloud_cephstorage.pp
index b645f9f..21fd5f9 100644 (file)
--- a/puppet/manifests/overcloud_cephstorage.pp
+++ b/puppet/manifests/overcloud_cephstorage.pp
@@ -31,4 +31,6 @@ if count(hiera('ntp::servers')) > 0 {
 }
 
 include ::ceph::profile::client
-include ::ceph::profile::osd
\ No newline at end of file
+include ::ceph::profile::osd
+
+hiera_include('ceph_classes')
\ No newline at end of file

diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
index 00bab7f..92171e8 100644 (file)
--- a/puppet/manifests/overcloud_compute.pp
+++ b/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')
\ No newline at end of file

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index bc20bad..db8b1cf 100644 (file)
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -436,4 +436,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

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 3d69331..541e55b 100644 (file)
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -744,6 +744,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 {

diff --git a/puppet/manifests/overcloud_object.pp b/puppet/manifests/overcloud_object.pp
index 24799c8..ed2ca7c 100644 (file)
--- a/puppet/manifests/overcloud_object.pp
+++ b/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')
\ No newline at end of file

diff --git a/puppet/manifests/overcloud_volume.pp b/puppet/manifests/overcloud_volume.pp
index edfeaec..2ef0884 100644 (file)
--- a/puppet/manifests/overcloud_volume.pp
+++ b/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')
\ No newline at end of file