Change flat network name for nosdn fdio scenario

[apex-tripleo-heat-templates.git] / puppet / services / snmp.yaml

diff --git a/puppet/services/snmp.yaml b/puppet/services/snmp.yaml
index fd6ed81..732058b 100644 (file)
--- a/puppet/services/snmp.yaml
+++ b/puppet/services/snmp.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   SNMP client configured with Puppet, to facilitate Ceilometer Hardware
@@ -6,6 +6,10 @@ description: >
   monitoring.
 
 parameters:
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -15,6 +19,14 @@ parameters:
   DefaultPasswords:
     default: {}
     type: json
+  RoleName:
+    default: ''
+    description: Role name on which the service is applied
+    type: string
+  RoleParameters:
+    default: {}
+    description: Parameters specific to the role
+    type: json
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -28,6 +40,14 @@ parameters:
     description: The user password for SNMPd with readonly rights running on all Overcloud nodes
     type: string
     hidden: true
+  SnmpdBindHost:
+    description: An array of bind host addresses on which SNMP daemon will listen.
+    type: comma_delimited_list
+    default: ['udp:161','udp6:[::1]:161']
+  SnmpdOptions:
+    description: A string containing the commandline options passed to snmpd
+    type: string
+    default: '-LS0-5d'
 
 outputs:
   role_data:
@@ -37,6 +57,8 @@ outputs:
       config_settings:
         tripleo::profile::base::snmp::snmpd_user: {get_param: SnmpdReadonlyUserName}
         tripleo::profile::base::snmp::snmpd_password: {get_param: SnmpdReadonlyUserPassword}
+        snmp::agentaddress: {get_param: SnmpdBindHost}
+        snmp::snmpd_options: {get_param: SnmpdOptions}
         tripleo.snmp.firewall_rules:
           '127 snmp':
             dport: 161
@@ -45,5 +67,5 @@ outputs:
         include ::tripleo::profile::base::snmp
       upgrade_tasks:
         - name: Stop snmp service
-          tags: step2
+          tags: step1
           service: name=snmpd state=stopped