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
This commit is contained in:
parent
d6837ea4a6
commit
5bacfe10f0
puppet
@ -30,14 +30,6 @@ parameters:
|
|||||||
default: default
|
default: default
|
||||||
description: Name of an existing Nova key pair to enable SSH access to the instances
|
description: Name of an existing Nova key pair to enable SSH access to the instances
|
||||||
type: string
|
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:
|
UpdateIdentifier:
|
||||||
default: ''
|
default: ''
|
||||||
type: string
|
type: string
|
||||||
@ -235,8 +227,6 @@ resources:
|
|||||||
server: {get_resource: BlockStorage}
|
server: {get_resource: BlockStorage}
|
||||||
config: {get_resource: BlockStorageConfig}
|
config: {get_resource: BlockStorageConfig}
|
||||||
input_values:
|
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]}
|
enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
|
||||||
|
|
||||||
# Map heat metadata into hiera datafiles
|
# Map heat metadata into hiera datafiles
|
||||||
@ -274,8 +264,6 @@ resources:
|
|||||||
volume:
|
volume:
|
||||||
mapped_data:
|
mapped_data:
|
||||||
tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
|
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
|
# Resource for site-specific injection of root certificate
|
||||||
NodeTLSCAData:
|
NodeTLSCAData:
|
||||||
|
@ -427,9 +427,6 @@ resources:
|
|||||||
corosync_ipv6: {get_input: corosync_ipv6}
|
corosync_ipv6: {get_input: corosync_ipv6}
|
||||||
tripleo::fencing::config: {get_input: fencing_config}
|
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
|
||||||
redis_vip: {get_input: redis_vip}
|
redis_vip: {get_input: redis_vip}
|
||||||
# Firewall
|
# Firewall
|
||||||
|
@ -35,8 +35,8 @@ outputs:
|
|||||||
value:
|
value:
|
||||||
service_name: snmp
|
service_name: snmp
|
||||||
config_settings:
|
config_settings:
|
||||||
snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName}
|
tripleo::profile::base::snmp::snmpd_user: {get_param: SnmpdReadonlyUserName}
|
||||||
snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
|
tripleo::profile::base::snmp::snmpd_password: {get_param: SnmpdReadonlyUserPassword}
|
||||||
tripleo.snmp.firewall_rules:
|
tripleo.snmp.firewall_rules:
|
||||||
'127 snmp':
|
'127 snmp':
|
||||||
dport: 161
|
dport: 161
|
||||||
|
Loading…
x
Reference in New Issue
Block a user