summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPradeep Kilambi <pkilambi@redhat.com>2017-04-26 14:31:46 -0400
committerPradeep Kilambi <pkilambi@redhat.com>2017-05-01 18:17:46 +0000
commitf8b5cacfd973d056a29bb57f3978b5ebb35f79e0 (patch)
tree7a02ecedb91258ee4f0ea23deaceb3366ddf46b2
parent5a6519f65105a8b060f1add746254d0f13db918d (diff)
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
-rw-r--r--environments/services-docker/undercloud-aodh.yaml5
-rw-r--r--environments/services-docker/undercloud-gnocchi.yaml4
-rw-r--r--environments/services-docker/undercloud-panko.yaml2
-rw-r--r--overcloud-resource-registry-puppet.j2.yaml8
-rw-r--r--roles_data_undercloud.yaml16
5 files changed, 27 insertions, 8 deletions
diff --git a/environments/services-docker/undercloud-aodh.yaml b/environments/services-docker/undercloud-aodh.yaml
new file mode 100644
index 00000000..236512f6
--- /dev/null
+++ b/environments/services-docker/undercloud-aodh.yaml
@@ -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
diff --git a/environments/services-docker/undercloud-gnocchi.yaml b/environments/services-docker/undercloud-gnocchi.yaml
new file mode 100644
index 00000000..55b0ac2d
--- /dev/null
+++ b/environments/services-docker/undercloud-gnocchi.yaml
@@ -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
diff --git a/environments/services-docker/undercloud-panko.yaml b/environments/services-docker/undercloud-panko.yaml
new file mode 100644
index 00000000..ffe3b6da
--- /dev/null
+++ b/environments/services-docker/undercloud-panko.yaml
@@ -0,0 +1,2 @@
+resource_registry:
+ OS::TripleO::Services::UndercloudPankoApi: ../docker/services/panko-api.yaml
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index 79ac7cce..88654503 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -199,6 +199,9 @@ resource_registry:
OS::TripleO::Services::GnocchiApi: puppet/services/gnocchi-api.yaml
OS::TripleO::Services::GnocchiMetricd: puppet/services/gnocchi-metricd.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):
OS::TripleO::Services::FluentdClient: 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::AodhNotifier: puppet/services/aodh-notifier.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::UndercloudPankoApi: OS::Heat::None
OS::TripleO::Services::MistralEngine: OS::Heat::None
OS::TripleO::Services::MistralApi: OS::Heat::None
OS::TripleO::Services::MistralExecutor: OS::Heat::None
diff --git a/roles_data_undercloud.yaml b/roles_data_undercloud.yaml
index df2e196b..9894f00e 100644
--- a/roles_data_undercloud.yaml
+++ b/roles_data_undercloud.yaml
@@ -37,11 +37,11 @@
- OS::TripleO::Services::NeutronCorePlugin
- OS::TripleO::Services::NeutronOvsAgent
- OS::TripleO::Services::NeutronDhcpAgent
- - OS::TripleO::Services::AodhApi
- - OS::TripleO::Services::AodhEvaluator
- - OS::TripleO::Services::AodhNotifier
- - OS::TripleO::Services::AodhListener
- - OS::TripleO::Services::GnocchiApi
- - OS::TripleO::Services::GnocchiMetricd
- - OS::TripleO::Services::GnocchiStatsd
- - OS::TripleO::Services::PankoApi
+ - OS::TripleO::Services::UndercloudAodhApi
+ - OS::TripleO::Services::UndercloudAodhEvaluator
+ - OS::TripleO::Services::UndercloudAodhNotifier
+ - OS::TripleO::Services::UndercloudAodhListener
+ - OS::TripleO::Services::UndercloudGnocchiApi
+ - OS::TripleO::Services::UndercloudGnocchiMetricd
+ - OS::TripleO::Services::UndercloudGnocchiStatsd
+ - OS::TripleO::Services::UndercloudPankoApi