From 5199ba88afc4f115b947a51080fc89ea70e5a1e8 Mon Sep 17 00:00:00 2001
From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Tue, 5 Sep 2017 17:35:51 +0400
Subject: [baremetal] Enable ceilometer/aodh services

Change-Id: I34706afbdbcbdaace0b0ae6c2c2e8cb932812d4e
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
---
 .../baremetal-mcp-ocata-odl-ha/infra/config.yml    | 20 +++++++++---------
 .../baremetal-mcp-ocata-odl-ha/infra/kvm.yml       | 24 +++++++++++-----------
 2 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra')

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml
index a7b08f8df..3f72e182f 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml
@@ -13,7 +13,7 @@ classes:
 - system.reclass.storage.system.openstack_database_cluster
 - system.reclass.storage.system.openstack_message_queue_cluster
 - system.reclass.storage.system.opendaylight_control_single
-#- system.reclass.storage.system.openstack_telemetry_cluster
+- system.reclass.storage.system.openstack_telemetry_cluster
 # - system.reclass.storage.system.stacklight_log_cluster
 # - system.reclass.storage.system.stacklight_monitor_cluster
 # - system.reclass.storage.system.stacklight_telemetry_cluster
@@ -56,15 +56,15 @@ parameters:
           params:
             keepalived_vip_priority: 102
             linux_system_codename: xenial
-#        openstack_telemetry_node01:
-#          params:
-#            linux_system_codename: xenial
-#        openstack_telemetry_node02:
-#          params:
-#            linux_system_codename: xenial
-#        openstack_telemetry_node03:
-#          params:
-#            linux_system_codename: xenial
+        openstack_telemetry_node01:
+          params:
+            linux_system_codename: xenial
+        openstack_telemetry_node02:
+          params:
+            linux_system_codename: xenial
+        openstack_telemetry_node03:
+          params:
+            linux_system_codename: xenial
         openstack_message_queue_node01:
           params:
             linux_system_codename: xenial
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
index f73d48e7a..41366f34f 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
@@ -11,7 +11,7 @@ classes:
 - system.salt.control.cluster.openstack_proxy_cluster
 - system.salt.control.cluster.openstack_database_cluster
 - system.salt.control.cluster.openstack_message_queue_cluster
-#- system.salt.control.cluster.openstack_telemetry_cluster
+- system.salt.control.cluster.openstack_telemetry_cluster
 # - system.salt.control.cluster.stacklight_server_cluster
 # - system.salt.control.cluster.stacklight_log_cluster
 # - system.salt.control.cluster.stacklight_telemetry_cluster
@@ -45,11 +45,11 @@ parameters:
           ram: 2048
           disk_profile: small
           net_profile: default
-#        openstack.telemetry:
-#          cpu: 4
-#          ram: 4096
-#          disk_profile: xxlarge
-#          net_profile: default
+        openstack.telemetry:
+          cpu: 2
+          ram: 3072
+          disk_profile: xxlarge
+          net_profile: default
         openstack.proxy:
           cpu: 2
           ram: 2048
@@ -83,12 +83,12 @@ parameters:
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               size: opendaylight.server
-#            mdb01:
-#              image: ${_param:salt_control_xenial_image}
-#            mdb02:
-#              image: ${_param:salt_control_xenial_image}
-#            mdb03:
-#              image: ${_param:salt_control_xenial_image}
+            mdb01:
+              image: ${_param:salt_control_xenial_image}
+            mdb02:
+              image: ${_param:salt_control_xenial_image}
+            mdb03:
+              image: ${_param:salt_control_xenial_image}
             ctl01:
               image: ${_param:salt_control_xenial_image}
             ctl02:
-- 
cgit 1.2.3-korg