Merge "Convert SNMP configuration to composable services format"

diff --cc overcloud-resource-registry-puppet.yaml
Simple merge

diff --cc overcloud.yaml
Simple merge

diff --cc puppet/controller.yaml
Simple merge

diff --cc puppet/manifests/overcloud_compute.pp
index 8db39b0,f0987c7..bb9af46
--- 1/puppet/manifests/overcloud_compute.pp
--- 2/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@@ -194,18 -194,7 +194,8 @@@ if hiera('step') >= 4 
    include ::ceilometer::agent::compute
    include ::ceilometer::agent::auth
  
-   $snmpd_user = hiera('snmpd_readonly_user_name')
-   snmp::snmpv3_user { $snmpd_user:
-     authtype => 'MD5',
-     authpass => hiera('snmpd_readonly_user_password'),
-   }
-   class { '::snmp':
-     agentaddress => ['udp:161','udp6:[::1]:161'],
-     snmpd_config => [ join(['createUser ', hiera('snmpd_readonly_user_name'), ' MD5 "', hiera('snmpd_readonly_user_password'), '"']), 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')
 -  package_manifest{ '/var/lib/tripleo/installed-packages/overcloud_compute': ensure => present }
 -
  }
 +
 +$package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_compute', hiera('step')])
 +package_manifest{$package_manifest_name: ensure => present}

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