diff --git a/elements/puppet-stack-config/puppet-stack-config.pp b/elements/puppet-stack-config/puppet-stack-config.pp
index 51457b04c..700d8e7c6 100644
--- a/elements/puppet-stack-config/puppet-stack-config.pp
+++ b/elements/puppet-stack-config/puppet-stack-config.pp
@@ -190,6 +190,10 @@ class { '::heat::db::mysql':
   allowed_hosts => $allowed_hosts,
 }
 if str2bool(hiera('enable_telemetry', false)) {
+  # SNMPD
+  class { '::tripleo::profile::base::snmp':
+    step => 4
+  }
 
   # Ceilometer
 
diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template
index 38b280d83..64996fe94 100644
--- a/elements/puppet-stack-config/puppet-stack-config.yaml.template
+++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template
@@ -305,6 +305,11 @@ neutron::agents::ml2::networking_baremetal::user_domain_name: "%{hiera('keystone
 neutron::agents::ml2::networking_baremetal::project_domain_name: "%{hiera('keystone_default_domain')}"
 neutron::agents::ml2::networking_baremetal::region_name: "%{hiera('keystone_region')}"
 
+# SNMPD
+tripleo::profile::base::snmp::snmpd_user: {{UNDERCLOUD_CEILOMETER_SNMPD_USER}}
+tripleo::profile::base::snmp::snmpd_password: {{UNDERCLOUD_CEILOMETER_SNMPD_PASSWORD}}
+snmp::agentaddress: ['udp:161', 'udp6:[::1]:161']
+
 # Ceilometer
 ceilometer::debug: "%{hiera('debug')}"
 ceilometer::metering_secret: {{UNDERCLOUD_CEILOMETER_METERING_SECRET}}