diff options
| author |   Steven Hardy <shardy@redhat.com> | 2016-05-24 18:40:45 +0100 |
|---|---|---|
| committer |   Emilien Macchi <emilien@redhat.com> | 2016-06-29 15:43:50 -0400 |
| commit | b5781172ba18d57d8c586c62102e6e856fb55bf6 (patch) | |
| tree | 3be1e524b4a1c254702ea72ada8451180521c21a /overcloud.yaml | |
| parent | 463333ccc7a33db21157db49b69c37a4b04593d9 (diff) | |
Convert SNMP configuration to composable services format
Change-Id: I7265b0781acefd4a0de687b0465144e57bcc079f
Partially-Implements: blueprint composable-services-within-roles
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 0abc512d..6f64b204 100644 --- a/overcloud.yaml +++ b/overcloud.yaml @@ -258,14 +258,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: > @@ -589,6 +581,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. @@ -598,6 +591,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. @@ -655,6 +649,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. @@ -873,8 +868,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} @@ -976,8 +969,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]} |