[baremetal] Enable ceilometer/aodh services

Change-Id: I34706afbdbcbdaace0b0ae6c2c2e8cb932812d4e
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index fc1fed7..e507ec9 100755 (executable)
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -42,6 +42,11 @@ salt -I 'neutron:gateway' state.sls neutron.gateway
 
 salt -I 'nova:compute' state.sls nova
 
+salt -I 'mongodb:server' state.sls mongodb -b 1
+salt -I 'aodh:server' state.sls aodh
+salt -I 'ceilometer:server' state.sls ceilometer
+salt -I 'ceilometer:agent' state.sls ceilometer
+
 salt -I 'horizon:server' state.sls horizon
 salt -I 'nginx:server' state.sls nginx
 

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 a7b08f8..3f72e18 100644 (file)
--- 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 f73d48e..41366f3 100644 (file)
--- 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:

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
index 93abf2a..ee5f639 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
@@ -6,6 +6,8 @@ classes:
 - system.nginx.server.proxy.openstack_api
 - system.nginx.server.proxy.openstack_vnc
 - system.nginx.server.proxy.openstack_web
+- system.nginx.server.proxy.openstack.aodh
+- system.nginx.server.proxy.openstack.ceilometer
 - system.horizon.server.single
 - system.salt.minion.cert.proxy
 - system.sphinx.server.doc.reclass

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml
index 4a56b65..4e90090 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml
@@ -2,6 +2,8 @@ classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
+- system.mongodb.server.cluster
+- system.mongodb.server.database.ceilometer
 - system.ceilometer.server.backend.mongodb
 # - system.ceilometer.server.backend.influxdb
 # - system.heka.ceilometer_collector.single
@@ -10,7 +12,7 @@ classes:
 - cluster.baremetal-mcp-ocata-odl-ha.infra
 parameters:
   _param:
-    keepalived_vip_interface: ens3
+    keepalived_openstack_telemetry_vip_interface: ens3
     keepalived_vip_virtual_router_id: 230
     cluster_vip_address: ${_param:openstack_telemetry_address}
     cluster_local_address: ${_param:single_address}
@@ -25,3 +27,7 @@ parameters:
       interface:
         ens2: ${_param:linux_dhcp_interface}
         ens3: ${_param:linux_single_interface}
+  mongodb:
+    server:
+      logging:
+        verbose: v

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml
index be3dc38..5ac2277 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml
@@ -12,7 +12,7 @@ classes:
 - system.reclass.storage.system.openstack_proxy_cluster
 - system.reclass.storage.system.openstack_database_cluster
 - system.reclass.storage.system.openstack_message_queue_cluster
-#- 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
@@ -55,15 +55,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-ovs-dpdk-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml
index a4945e5..22b4a8a 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-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
@@ -73,12 +73,12 @@ parameters:
       cluster:
         internal:
           node:
-#            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:

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml
index d6a26b0..14fb3ab 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml
@@ -6,6 +6,8 @@ classes:
 - system.nginx.server.proxy.openstack_api
 - system.nginx.server.proxy.openstack_vnc
 - system.nginx.server.proxy.openstack_web
+- system.nginx.server.proxy.openstack.aodh
+- system.nginx.server.proxy.openstack.ceilometer
 - system.horizon.server.single
 - system.salt.minion.cert.proxy
 - system.sphinx.server.doc.reclass

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml
index 2893294..b2e49cb 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml
@@ -2,6 +2,8 @@ classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
+- system.mongodb.server.cluster
+- system.mongodb.server.database.ceilometer
 - system.ceilometer.server.backend.mongodb
 # - system.ceilometer.server.backend.influxdb
 # - system.heka.ceilometer_collector.single
@@ -10,7 +12,7 @@ classes:
 - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
 parameters:
   _param:
-    keepalived_vip_interface: ens3
+    keepalived_openstack_telemetry_vip_interface: ens3
     keepalived_vip_virtual_router_id: 230
     cluster_vip_address: ${_param:openstack_telemetry_address}
     cluster_local_address: ${_param:single_address}
@@ -25,3 +27,7 @@ parameters:
       interface:
         ens2: ${_param:linux_dhcp_interface}
         ens3: ${_param:linux_single_interface}
+  mongodb:
+    server:
+      logging:
+        verbose: v

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
index d919fe7..5c8026f 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
@@ -47,7 +47,7 @@ parameters:
           net_profile: default
         openstack.telemetry:
           cpu: 2
-          ram: 4096
+          ram: 3072
           disk_profile: xxlarge
           net_profile: default
         openstack.proxy:

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
index 2147741..30f2c46 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
@@ -6,6 +6,8 @@ classes:
 - system.nginx.server.proxy.openstack_api
 - system.nginx.server.proxy.openstack_vnc
 - system.nginx.server.proxy.openstack_web
+- system.nginx.server.proxy.openstack.aodh
+- system.nginx.server.proxy.openstack.ceilometer
 - system.horizon.server.single
 - system.salt.minion.cert.proxy
 - system.sphinx.server.doc.reclass

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml
index 505ee7f..0e3c7bd 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml
@@ -2,6 +2,8 @@ classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
+- system.mongodb.server.cluster
+- system.mongodb.server.database.ceilometer
 - system.ceilometer.server.backend.mongodb
 # - system.ceilometer.server.backend.influxdb
 # - system.heka.ceilometer_collector.single
@@ -10,7 +12,7 @@ classes:
 - cluster.baremetal-mcp-ocata-ovs-ha.infra
 parameters:
   _param:
-    keepalived_vip_interface: ens3
+    keepalived_openstack_telemetry_vip_interface: ens3
     keepalived_vip_virtual_router_id: 230
     cluster_vip_address: ${_param:openstack_telemetry_address}
     cluster_local_address: ${_param:single_address}
@@ -25,3 +27,7 @@ parameters:
       interface:
         ens2: ${_param:linux_dhcp_interface}
         ens3: ${_param:linux_single_interface}
+  mongodb:
+    server:
+      logging:
+        verbose: v