diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2019-04-17 09:36:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-04-17 09:36:42 +0000 |
| commit | 283b949aedaee0bdcba5c36e7cd9108b0c1aae46 (patch) | |
| tree | d65e52d758b7c448d09c1452f30d4cb30e3214f8 /mcp/reclass/classes | |
| parent | c257f070507763888e55d3df4a35d858fe900649 (diff) | |
| parent | c667bd8bfec7f668c9fc0db5d58169ec3439a2a6 (diff) | |
Merge "[ha] Take out class with backports repo" into stable/hunter
Diffstat (limited to 'mcp/reclass/classes')
4 files changed, 10 insertions, 5 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..4f36c0fb1 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 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 |