Disable Telemetry services on undercloud containers

We dont deploy telemetry by default on undercloud anymore.
Lets disable by default and provide an env file to enable
on demand.

Change-Id: I03807b3b75bb038c2d2bb342f3327e6eca2f3976
This commit is contained in:
Pradeep Kilambi 2017-04-26 14:31:46 -04:00
parent 5a6519f651
commit f8b5cacfd9
5 changed files with 27 additions and 8 deletions

View File

@ -0,0 +1,5 @@
resource_registry:
OS::TripleO::Services::UndercloudAodhApi: ../docker/services/aodh-api.yaml
OS::TripleO::Services::UndercloudAodhEvaluator: ../docker/services/aodh-evaluator.yaml
OS::TripleO::Services::UndercloudAodhNotifier: ../docker/services/aodh-notifier.yaml
OS::TripleO::Services::UndercloudAodhListener: ../docker/services/aodh-listener.yaml

View File

@ -0,0 +1,4 @@
resource_registry:
OS::TripleO::Services::UndercloudGnocchiApi: ../docker/services/gnocchi-api.yaml
OS::TripleO::Services::UndercloudGnocchiMetricd: ../docker/services/gnocchi-metricd.yaml
OS::TripleO::Services::UndercloudGnocchiStatsd: ../docker/services/gnocchi-statsd.yaml

View File

@ -0,0 +1,2 @@
resource_registry:
OS::TripleO::Services::UndercloudPankoApi: ../docker/services/panko-api.yaml

View File

@ -199,6 +199,9 @@ resource_registry:
OS::TripleO::Services::GnocchiApi: puppet/services/gnocchi-api.yaml OS::TripleO::Services::GnocchiApi: puppet/services/gnocchi-api.yaml
OS::TripleO::Services::GnocchiMetricd: puppet/services/gnocchi-metricd.yaml OS::TripleO::Services::GnocchiMetricd: puppet/services/gnocchi-metricd.yaml
OS::TripleO::Services::GnocchiStatsd: puppet/services/gnocchi-statsd.yaml OS::TripleO::Services::GnocchiStatsd: puppet/services/gnocchi-statsd.yaml
OS::TripleO::Services::UndercloudGnocchiApi: OS::Heat::None
OS::TripleO::Services::UndercloudGnocchiMetricd: OS::Heat::None
OS::TripleO::Services::UndercloudGnocchiStatsd: OS::Heat::None
# Services that are disabled by default (use relevant environment files): # Services that are disabled by default (use relevant environment files):
OS::TripleO::Services::FluentdClient: OS::Heat::None OS::TripleO::Services::FluentdClient: OS::Heat::None
OS::TripleO::Services::Collectd: OS::Heat::None OS::TripleO::Services::Collectd: OS::Heat::None
@ -216,7 +219,12 @@ resource_registry:
OS::TripleO::Services::AodhEvaluator: puppet/services/aodh-evaluator.yaml OS::TripleO::Services::AodhEvaluator: puppet/services/aodh-evaluator.yaml
OS::TripleO::Services::AodhNotifier: puppet/services/aodh-notifier.yaml OS::TripleO::Services::AodhNotifier: puppet/services/aodh-notifier.yaml
OS::TripleO::Services::AodhListener: puppet/services/aodh-listener.yaml OS::TripleO::Services::AodhListener: puppet/services/aodh-listener.yaml
OS::TripleO::Services::UndercloudAodhApi: OS::Heat::None
OS::TripleO::Services::UndercloudAodhEvaluator: OS::Heat::None
OS::TripleO::Services::UndercloudAodhNotifier: OS::Heat::None
OS::TripleO::Services::UndercloudAodhListener: OS::Heat::None
OS::TripleO::Services::PankoApi: puppet/services/panko-api.yaml OS::TripleO::Services::PankoApi: puppet/services/panko-api.yaml
OS::TripleO::Services::UndercloudPankoApi: OS::Heat::None
OS::TripleO::Services::MistralEngine: OS::Heat::None OS::TripleO::Services::MistralEngine: OS::Heat::None
OS::TripleO::Services::MistralApi: OS::Heat::None OS::TripleO::Services::MistralApi: OS::Heat::None
OS::TripleO::Services::MistralExecutor: OS::Heat::None OS::TripleO::Services::MistralExecutor: OS::Heat::None

View File

@ -37,11 +37,11 @@
- OS::TripleO::Services::NeutronCorePlugin - OS::TripleO::Services::NeutronCorePlugin
- OS::TripleO::Services::NeutronOvsAgent - OS::TripleO::Services::NeutronOvsAgent
- OS::TripleO::Services::NeutronDhcpAgent - OS::TripleO::Services::NeutronDhcpAgent
- OS::TripleO::Services::AodhApi - OS::TripleO::Services::UndercloudAodhApi
- OS::TripleO::Services::AodhEvaluator - OS::TripleO::Services::UndercloudAodhEvaluator
- OS::TripleO::Services::AodhNotifier - OS::TripleO::Services::UndercloudAodhNotifier
- OS::TripleO::Services::AodhListener - OS::TripleO::Services::UndercloudAodhListener
- OS::TripleO::Services::GnocchiApi - OS::TripleO::Services::UndercloudGnocchiApi
- OS::TripleO::Services::GnocchiMetricd - OS::TripleO::Services::UndercloudGnocchiMetricd
- OS::TripleO::Services::GnocchiStatsd - OS::TripleO::Services::UndercloudGnocchiStatsd
- OS::TripleO::Services::PankoApi - OS::TripleO::Services::UndercloudPankoApi