aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-06-25 20:57:01 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2018-06-25 20:58:54 +0400
commitc875da0f72a06e05bdf76f1f2ab9e1a7136b8ae3 (patch)
tree627fa6957fe4f7b2abf967207deb561198d68ec3
parent3ed2d8dab3d75628cd1f7edd47051623c643592c (diff)
[ha] Pin UCA's libvirt/qemu on computes
* install libvirt/qemu packages only from UCA on computes * shift panko/aodh db settings to telemetry nodes Change-Id: I0f4434aa8d2139870afaed9d9831db0a9af10e51 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml1
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j26
-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_telemetry.yml.j25
4 files changed, 7 insertions, 7 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml
index 90cbb87bb..c7c6f2fab 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml
@@ -7,6 +7,7 @@
##############################################################################
---
classes:
+ - system.linux.system.repo.mcp.mirror.v1.openstack
- system.linux.system.repo.glusterfs
- system.glusterfs.client.cluster
- system.nova.compute.cluster
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 38fe06a89..0189e038c 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
@@ -88,12 +88,6 @@ parameters:
glance:
server:
<<: *db_conn_recycle_time
- aodh:
- server:
- <<: *db_conn_recycle_time
- panko:
- server:
- <<: *db_conn_recycle_time
{%- if conf.MCP_VCP %}
heat:
server:
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 1e641b6bd..d070cf3ed 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
@@ -251,7 +251,7 @@ parameters:
pin:
- pin: 'release o=Canonical'
priority: 1200
- package: 'python-pymysql'
+ package: 'python-pymysql libvirt* *qemu*'
kernel:
sysctl:
net.ipv4.tcp_congestion_control: yeah
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_telemetry.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_telemetry.yml.j2
index 2ed7c5336..c55ea0049 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_telemetry.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_telemetry.yml.j2
@@ -78,8 +78,13 @@ parameters:
gnocchi:
wsgi:
threads: 1
+ panko:
+ server: &db_conn_recycle_time
+ database:
+ connection_recycle_time: ${_param:db_connection_recycle_time}
aodh:
server:
+ <<: *db_conn_recycle_time
coordination_backend:
url: ${_param:openstack_telemetry_redis_url}
ceilometer: