diff options
| author |   Dan Prince <dprince@redhat.com> | 2016-08-26 13:13:09 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2016-09-02 07:14:05 -0400 |
| commit | 5bacfe10f07970c55e80e3ff2886b9dba43696ee (patch) | |
| tree | 074b9c5521510e2dd53a18469514426790a9a6e8 | |
| parent | d6837ea4a62ec74c4b06901c257fe4d6f4bea73c (diff) | |
Move snmp settings into composable services
Provides snmp_readonly_user_* parameters to the base::snmp class
and removes them from the role templates.
Related-bug: #1604414
Co-Authored-By: Giulio Fidente <gfidente@redhat.com>
Change-Id: I35b1ff23baff0c25e742562e1103a3882f7bf767
| -rw-r--r-- | puppet/cinder-storage.yaml | 12 | ||||
| -rw-r--r-- | puppet/controller.yaml | 3 | ||||
| -rw-r--r-- | puppet/services/snmp.yaml | 4 |
3 files changed, 2 insertions, 17 deletions
diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml index 26906532..bc26df75 100644 --- a/puppet/cinder-storage.yaml +++ b/puppet/cinder-storage.yaml @@ -30,14 +30,6 @@ parameters: default: default description: Name of an existing Nova key pair to enable SSH access to the instances type: string - SnmpdReadonlyUserName: - default: ro_snmp_user - description: The user name for SNMPd with readonly rights running on all Overcloud nodes - type: string - SnmpdReadonlyUserPassword: - description: The user password for SNMPd with readonly rights running on all Overcloud nodes - type: string - hidden: true UpdateIdentifier: default: '' type: string @@ -235,8 +227,6 @@ resources: server: {get_resource: BlockStorage} config: {get_resource: BlockStorageConfig} input_values: - snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName} - snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword} enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]} # Map heat metadata into hiera datafiles @@ -274,8 +264,6 @@ resources: volume: mapped_data: tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade} - snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name} - snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password} # Resource for site-specific injection of root certificate NodeTLSCAData: diff --git a/puppet/controller.yaml b/puppet/controller.yaml index a6efe1aa..a4f87525 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -427,9 +427,6 @@ resources: corosync_ipv6: {get_input: corosync_ipv6} tripleo::fencing::config: {get_input: fencing_config} - # Neutron - snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name} - snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password} # Redis redis_vip: {get_input: redis_vip} # Firewall diff --git a/puppet/services/snmp.yaml b/puppet/services/snmp.yaml index e38ccf42..4d01632d 100644 --- a/puppet/services/snmp.yaml +++ b/puppet/services/snmp.yaml @@ -35,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 |