From 0415a2a82bc1b72570a8e10a6384fc5a9f34b04f Mon Sep 17 00:00:00 2001 From: Pradeep Kilambi Date: Wed, 18 May 2016 22:26:22 -0400 Subject: Gnocchi composable roles Implements: blueprint composable-services-within-roles Co-Authored-By: Juan Antonio Osorio Robles Co-Authored-By: Carlos Camacho Depends-On: Id728aae79442c45ab48fe0914c065f1807e8890d Closes-Bug: #1601846 Change-Id: I40a3815923099d00a0f3fc1d88a942784e7c6fb9 --- overcloud.yaml | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'overcloud.yaml') diff --git a/overcloud.yaml b/overcloud.yaml index 1e56126d..84d65926 100644 --- a/overcloud.yaml +++ b/overcloud.yaml @@ -296,19 +296,6 @@ parameters: ] } type: json - GnocchiBackend: - default: file - description: The short name of the Gnocchi backend to use. Should be one - of swift, rbd or file - type: string - constraints: - - allowed_values: ['swift', 'file', 'rbd'] - GnocchiIndexerBackend: - default: 'mysql' - description: The short name of the Gnocchi indexer backend to use. - type: string - GnocchiPassword: - description: The password for the gnocchi service account. type: string hidden: true InstanceNameTemplate: @@ -509,6 +496,9 @@ parameters: - OS::TripleO::Services::CeilometerAgentCentral - OS::TripleO::Services::CeilometerAgentNotification - OS::TripleO::Services::Horizon + - OS::TripleO::Services::GnocchiApi + - OS::TripleO::Services::GnocchiMetricd + - OS::TripleO::Services::GnocchiStatsd description: A list of service resources (configured in the Heat resource_registry) which represent nested stacks @@ -782,9 +772,6 @@ resources: ExtraConfig: {get_param: ExtraConfig} FencingConfig: {get_param: FencingConfig} Flavor: {get_param: OvercloudControlFlavor} - GnocchiPassword: {get_param: GnocchiPassword} - GnocchiBackend: {get_param: GnocchiBackend} - GnocchiIndexerBackend: {get_param: GnocchiIndexerBackend} HAProxySyslogAddress: {get_param: HAProxySyslogAddress} HeatAuthEncryptionKey: {get_resource: HeatAuthEncryptionKey} HorizonSecret: {get_resource: HorizonSecret} -- cgit 1.2.3-korg