aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/controller.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-30 12:39:17 +0000
committerGerrit Code Review <review@openstack.org>2016-06-30 12:39:17 +0000
commit109fafc6c0f12c4c187f6917cacd7547849ee957 (patch)
treeed3c8fc9305ffcf2cb7e0b1afe6803dfc5feaa80 /puppet/controller.yaml
parent66b9735f42c7ff774c3b8d54a26c95c05a3ad2b4 (diff)
parentb5781172ba18d57d8c586c62102e6e856fb55bf6 (diff)
Merge "Convert SNMP configuration to composable services format"
Diffstat (limited to 'puppet/controller.yaml')
-rw-r--r--puppet/controller.yaml10
1 files changed, 0 insertions, 10 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index c9df00cb..9d57f28d 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -305,14 +305,6 @@ parameters:
type: string
default: '' # Has to be here because of the ignored empty value bug
description: An IP address which is wrapped in brackets in case of IPv6
- 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
SwiftHashSuffix:
description: A random string to be used as a salt when hashing to determine mappings
in the ring.
@@ -661,8 +653,6 @@ resources:
ceilometer_internal_url: {get_param: [EndpointMap, CeilometerInternal, uri]}
ceilometer_admin_url: {get_param: [EndpointMap, CeilometerAdmin, uri]}
ceilometer_agent_auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
- snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName}
- snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
nova_enable_db_purge: {get_param: NovaEnableDBPurge}
nova_ipv6: {get_param: NovaIPv6}
corosync_ipv6: {get_param: CorosyncIPv6}