X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fsnmp.yaml;h=be9d143e0a0d0d9d59ae08c7dbcdd228d5f34fc0;hb=74a97cb69a7822b620eb35527f5a1a48d94d7221;hp=458f444bbe28c4bdeeca77a9b97c6e2fea51788d;hpb=7a3b6c68e61919cb2818e9e21c0734ff3a8a6c36;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/snmp.yaml b/puppet/services/snmp.yaml
index 458f444b..be9d143e 100644
--- a/puppet/services/snmp.yaml
+++ b/puppet/services/snmp.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   SNMP client configured with Puppet, to facilitate Ceilometer Hardware
@@ -6,6 +6,15 @@ description: >
   monitoring.
 
 parameters:
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -26,8 +35,8 @@ outputs:
     value:
       service_name: snmp
       config_settings:
-        snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName}
-        snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
+        tripleo::profile::base::snmp::snmpd_user: {get_param: SnmpdReadonlyUserName}
+        tripleo::profile::base::snmp::snmpd_password: {get_param: SnmpdReadonlyUserPassword}
         tripleo.snmp.firewall_rules:
           '127 snmp':
             dport: 161