diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-06-30 12:39:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-06-30 12:39:17 +0000 |
| commit | 109fafc6c0f12c4c187f6917cacd7547849ee957 (patch) | |
| tree | ed3c8fc9305ffcf2cb7e0b1afe6803dfc5feaa80 /overcloud.yaml | |
| parent | 66b9735f42c7ff774c3b8d54a26c95c05a3ad2b4 (diff) | |
| parent | b5781172ba18d57d8c586c62102e6e856fb55bf6 (diff) | |
Merge "Convert SNMP configuration to composable services format"
Diffstat (limited to 'overcloud.yaml')
| -rw-r--r-- | overcloud.yaml | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/overcloud.yaml b/overcloud.yaml index 9bd3a579..11dcd896 100644 --- a/overcloud.yaml +++ b/overcloud.yaml @@ -254,14 +254,6 @@ parameters: description: The password for Redis type: string hidden: true - 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 StorageVirtualFixedIPs: default: [] description: > @@ -573,6 +565,7 @@ parameters: - OS::TripleO::Services::Ntp - OS::TripleO::Services::SwiftProxy - OS::TripleO::Services::SwiftStorage + - OS::TripleO::Services::Snmp description: A list of service resources (configured in the Heat resource_registry) which represent nested stacks for each service that should get installed on the Controllers. @@ -582,6 +575,7 @@ parameters: default: - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::Ntp + - OS::TripleO::Services::Snmp description: A list of service resources (configured in the Heat resource_registry) which represent nested stacks for each service that should get installed on the Compute Nodes. @@ -645,6 +639,7 @@ parameters: default: - OS::TripleO::Services::Ntp - OS::TripleO::Services::SwiftStorage + - OS::TripleO::Services::Snmp description: A list of service resources (configured in the Heat resource_registry) which represent nested stacks for each service that should get installed on the ObjectStorage nodes. @@ -863,8 +858,6 @@ resources: RabbitClientUseSSL: {get_param: RabbitClientUseSSL} RabbitClientPort: {get_param: RabbitClientPort} RedisPassword: {get_param: RedisPassword} - SnmpdReadonlyUserName: {get_param: SnmpdReadonlyUserName} - SnmpdReadonlyUserPassword: {get_param: SnmpdReadonlyUserPassword} RedisVirtualIP: {get_attr: [RedisVirtualIP, ip_address]} RedisVirtualIPUri: {get_attr: [RedisVirtualIP, ip_address_uri]} SwiftHashSuffix: {get_param: SwiftHashSuffix} @@ -953,8 +946,6 @@ resources: RabbitUserName: {get_param: RabbitUserName} RabbitClientUseSSL: {get_param: RabbitClientUseSSL} RabbitClientPort: {get_param: RabbitClientPort} - SnmpdReadonlyUserName: {get_param: SnmpdReadonlyUserName} - SnmpdReadonlyUserPassword: {get_param: SnmpdReadonlyUserPassword} ServiceNetMap: {get_param: ServiceNetMap} TimeZone: {get_param: TimeZone} EndpointMap: {get_attr: [EndpointMap, endpoint_map]} |