summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2019-03-14 19:08:39 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2019-03-14 19:15:19 +0400
commitb84ea4cd4cce6db24a2bc7c392e3be0e7dc4ac78 (patch)
tree6de5428cd922aa4539dc24470e9e3c02fbb8a7c5
parenta7784e64f315f863c866f45cabc467cf2b69e0d5 (diff)
Smooth down telemetry services
* update gnocchi to 4.3 * remove outdated ceilometer api Change-Id: I7adaf3ddc76d93531b6b0997b684672b80f2992f Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
-rw-r--r--.gitmodules4
-rwxr-xr-xmcp/config/states/gnocchi_deps11
-rwxr-xr-xmcp/config/states/openstack_ha1
-rwxr-xr-xmcp/config/states/openstack_noha1
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_control_init.yml1
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_database.yml1
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j22
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j23
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/haproxy_openstack_api.yml11
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j22
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j22
m---------mcp/salt-formulas/salt-formula-gnocchi0
12 files changed, 6 insertions, 33 deletions
diff --git a/.gitmodules b/.gitmodules
index 4c4f73044..36c68a82a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -50,3 +50,7 @@
path = mcp/salt-formulas/salt-formula-horizon
url = https://gerrit.mcp.mirantis.com/salt-formulas/horizon
branch = master
+[submodule "salt-formula-gnocchi"]
+ path = mcp/salt-formulas/salt-formula-gnocchi
+ url = https://gerrit.mcp.mirantis.com/salt-formulas/gnocchi
+ branch = master
diff --git a/mcp/config/states/gnocchi_deps b/mcp/config/states/gnocchi_deps
deleted file mode 100755
index 50e4a61dc..000000000
--- a/mcp/config/states/gnocchi_deps
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash -e
-##############################################################################
-# Copyright (c) 2019 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-salt -I 'gnocchi:server' pkg.install pkgs='["python-pip", "gnocchi-api"]'
-salt -I 'gnocchi:server' pip.install protobuf,trollius user=gnocchi
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index 5027a8c2e..a00c21fb3 100755
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -62,7 +62,6 @@ salt -I 'barbican:server:role:primary' state.sls barbican
salt -I 'barbican:server:role:secondary' state.sls barbican -b 1
salt -I 'barbican:client' state.sls barbican
-$(dirname "${BASH_SOURCE[0]}")/gnocchi_deps
salt -I 'redis:cluster:role:master' state.sls redis
salt -I 'redis:server' state.sls redis
salt -I 'gnocchi:server' state.sls gnocchi -b 1
diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha
index f5782aca2..0f745565c 100755
--- a/mcp/config/states/openstack_noha
+++ b/mcp/config/states/openstack_noha
@@ -47,7 +47,6 @@ salt -I 'nova:compute' state.sls nova,armband
salt -I 'barbican:server' state.sls barbican
salt -I 'barbican:client' state.sls barbican
-$(dirname "${BASH_SOURCE[0]}")/gnocchi_deps
salt -I 'redis:server' state.sls redis
salt -I 'gnocchi:server' state.sls gnocchi
salt -I 'panko:server' state.sls panko
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control_init.yml b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control_init.yml
index 7310833b8..f5678557d 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control_init.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control_init.yml
@@ -9,7 +9,6 @@
classes:
- system.keystone.client.single
- system.keystone.client.service.aodh
- - system.keystone.client.service.ceilometer
- system.keystone.client.service.nova21
- system.keystone.client.service.nova-placement
- system.keystone.client.service.cinder3
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_database.yml b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_database.yml
index badfa3a3c..4b90ec2b8 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_database.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_database.yml
@@ -10,7 +10,6 @@ classes:
- system.linux.system.repo.mcp.mirror.v1.openstack
- system.galera.server.cluster
- system.galera.server.database.aodh
- - system.galera.server.database.ceilometer
- system.galera.server.database.cinder
- system.galera.server.database.designate
- system.galera.server.database.glance
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2
index 3b4492d38..a327919c5 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2
@@ -150,7 +150,7 @@ parameters:
horizon_identity_encryption: none
horizon_identity_version: 3
aodh_service_host: ${_param:openstack_telemetry_address}
- gnocchi_version: 4.2
+ gnocchi_version: 4.3
gnocchi_service_host: ${_param:openstack_telemetry_address}
panko_version: ${_param:openstack_version}
panko_service_host: ${_param:openstack_telemetry_address}
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2
index 7e038b16c..10222bfc5 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2
@@ -13,7 +13,6 @@ classes:
- 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.nginx.server.proxy.openstack.barbican
- system.apache.server.single
- system.horizon.server.single
@@ -50,8 +49,6 @@ parameters:
address: ${_param:openstack_proxy_address}
nginx_proxy_openstack_api_aodh:
<<: *nginx_openstack_proxy_address
- nginx_proxy_openstack_api_ceilometer:
- <<: *nginx_openstack_proxy_address
nginx_proxy_openstack_api_cinder:
<<: *nginx_openstack_proxy_address
nginx_proxy_openstack_api_glance:
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/haproxy_openstack_api.yml b/mcp/reclass/classes/cluster/mcp-common-noha/haproxy_openstack_api.yml
index 595e14b68..66f5968c3 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/haproxy_openstack_api.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/haproxy_openstack_api.yml
@@ -131,17 +131,6 @@ parameters:
host: ${_param:cluster_node01_address}
port: 8775
params: ${_param:haproxy_check}
- ceilometer_api:
- type: general-service
- check: false
- binds:
- - address: ${_param:cluster_vip_address}
- port: 8777
- servers:
- - name: ${_param:cluster_node01_hostname}
- host: ${_param:cluster_node01_address}
- port: 8777
- params: ${_param:haproxy_check}
aodh-api:
type: openstack-service
service_name: aodh
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
index cdbb20138..cf0348c12 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
@@ -22,7 +22,6 @@ classes:
- system.keystone.client.service.nova21
- system.keystone.client.service.nova-placement
- system.keystone.client.service.cinder3
- - system.keystone.client.service.ceilometer
- system.keystone.client.service.aodh
- system.keystone.client.service.gnocchi
- system.keystone.client.service.panko
@@ -39,7 +38,6 @@ classes:
- system.galera.server.database.heat
- system.galera.server.database.keystone
- system.galera.server.database.nova
- - system.galera.server.database.ceilometer
- system.galera.server.database.aodh
- system.galera.server.database.gnocchi
- system.galera.server.database.panko
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2
index dbddd647b..de54136a6 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2
@@ -67,7 +67,7 @@ parameters:
aodh_version: ${_param:openstack_version}
aodh_service_host: ${_param:cluster_local_address}
- gnocchi_version: 4.2
+ gnocchi_version: 4.3
gnocchi_service_host: ${_param:cluster_local_address}
panko_version: ${_param:openstack_version}
panko_service_host: ${_param:cluster_local_address}
diff --git a/mcp/salt-formulas/salt-formula-gnocchi b/mcp/salt-formulas/salt-formula-gnocchi
new file mode 160000
+Subproject 52049de243bc473b9c905d1948d9c5d11739be3