summaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2019-04-10 17:41:52 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2019-04-11 16:27:42 +0400
commitaebae197459879fd3ddcfaeb8ac1dce2d8fde046 (patch)
tree37fa7b1c4cbda8191f3cf30681b7d38075bba5c6 /mcp
parent59269ee00c235324efd35ce9966e5ff38b9cea47 (diff)
[ha] Take out class with backports repo
* update system reclass * rectify telemetry redis options Change-Id: I6dca1ae52e7f7d73a90e53fceddca8e86872651b Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp')
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/passwords.yml1
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j22
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j213
m---------mcp/reclass/classes/system0
4 files changed, 10 insertions, 6 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/passwords.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/passwords.yml
index 0c6d274b4..f51563e7c 100644
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/passwords.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/passwords.yml
@@ -55,6 +55,7 @@ parameters:
heat_domain_admin_password: ${_param:opnfv_main_password}
ceilometer_influxdb_password: ${_param:opnfv_main_password}
ceilometer_secret_key: ${_param:opnfv_main_password}
+ openstack_telemetry_redis_password: ${_param:opnfv_main_password}
opendaylight_password: admin
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
index cc4ed7d3d..fe844e7c1 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
@@ -27,6 +27,7 @@ classes:
- system.glusterfs.client.cluster
- system.glusterfs.client.volume.glance
- system.glusterfs.client.volume.keystone
+ - cluster.all-mcp-arch-common.backports
- cluster.mcp-common-ha.glusterfs_repo
{%- if not conf.MCP_VCP %}
# sync from kvm
@@ -44,7 +45,6 @@ classes:
# - system.salt.control.cluster.stacklight_server_cluster
# - system.salt.control.cluster.stacklight_log_cluster
# - system.salt.control.cluster.stacklight_telemetry_cluster
- - cluster.all-mcp-arch-common.backports
- cluster.mcp-common-ha.infra.kvm_pdf
- cluster.all-mcp-arch-common.opnfv.maas_proxy
- cluster.all-mcp-arch-common.opnfv.lab_proxy_pdf
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 a5a073b50..cf09d593b 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
@@ -46,14 +46,9 @@ classes:
- service.barbican.server.plugin.simple_crypto
- service.redis.server.single
- service.ceilometer.server.single
- - system.ceilometer.server.coordination.redis
- system.ceilometer.server.backend.default
- system.aodh.server.single
- - system.aodh.server.coordination.redis
- system.gnocchi.server.single
- - system.gnocchi.common.storage.incoming.redis
- - system.gnocchi.common.storage.redis
- - system.gnocchi.common.coordination.redis
- service.panko.server.single
- system.apache.server.site.gnocchi
- system.apache.server.site.panko
@@ -175,6 +170,14 @@ parameters:
appendfsync: 'no'
bind:
address: ${_param:single_address}
+ gnocchi:
+ common:
+ storage:
+ driver: redis
+ redis_url: redis://${_param:single_address}:6379
+ incoming:
+ driver: redis
+ redis_url: redis://${_param:single_address}:6379
nfs:
server:
share:
diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system
-Subproject cddeb5b6fdc6231ef6fbe8bd404f1f366ee9237
+Subproject 39baa623d525cd9a7eaedb5661e6b6730f0311b