summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/virtual-mcp-ocata-common
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-09-26 13:21:23 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-09-27 06:41:51 +0000
commita27ad89c0d97ff1be7f40af51b59df8d26dc7fe4 (patch)
tree8af575318ff6dc85db790b3fd3695af7800292d7 /mcp/reclass/classes/cluster/virtual-mcp-ocata-common
parent533b81df35acd7c2f16cd347cf3167583e870d38 (diff)
[virtual] Switch compute nodes to uca repo
Test of snaps_health_check gets console output of instance, which is empty (https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1667033), therefore take affected packages of computes from UCA repo. Change-Id: I4e13a40dd47caf305efd9f393b3c3cf5a17ef312 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commit c76d5e92d9e6cdfc614be4a1ed7b9e630c711008)
Diffstat (limited to 'mcp/reclass/classes/cluster/virtual-mcp-ocata-common')
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml11
1 files changed, 9 insertions, 2 deletions
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
index 6bc5e77cb..d072956dc 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
@@ -1,7 +1,5 @@
---
classes:
- - system.linux.system.repo.mcp.openstack
- - system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.linux.storage.loopback
- service.nfs.client
@@ -22,6 +20,8 @@ parameters:
loopback_device_size: 10
nova:
compute:
+ libvirt_service: libvirtd
+ libvirt_bin: /etc/default/libvirtd
vncproxy_url: http://${_param:cluster_vip_address}:6080
network:
region: ${_param:openstack_region}
@@ -55,6 +55,13 @@ parameters:
device: ${_param:openstack_control_address}:/srv/nova/instances
linux:
system:
+ repo:
+ uca:
+ # yamllint disable-line rule:line-length
+ source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
+ architectures: amd64
+ key_id: EC4926EA
+ key_server: keyserver.ubuntu.com
kernel:
sysctl:
vm.dirty_ratio: 10