summaryrefslogtreecommitdiffstats
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
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)
-rwxr-xr-xmcp/config/states/dpdk4
-rwxr-xr-xmcp/config/states/neutron_compute2
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml11
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml14
4 files changed, 13 insertions, 18 deletions
diff --git a/mcp/config/states/dpdk b/mcp/config/states/dpdk
index ad435630c..9eba5c083 100755
--- a/mcp/config/states/dpdk
+++ b/mcp/config/states/dpdk
@@ -10,9 +10,5 @@ salt -I 'nova:compute' cmd.run 'rm -vrf /etc/apt/preferences.d/*'
salt -I 'nova:compute' file.remove '/etc/apt/sources.list.d/mirantis_openstack.list'
salt -I 'nova:compute' pkg.refresh_db
-salt -I 'nova:compute' pkg.install neutron-common
-salt -I 'nova:compute' file.append /etc/sudoers.d/neutron_sudoers \
- args='neutron ALL = (root) NOPASSWD: /usr/bin/neutron-rootwrap-daemon /etc/neutron/rootwrap.conf'
-
salt -I 'nova:compute' pkg.install libvirt-bin
salt -I 'nova:compute' file.chown /var/run/openvswitch libvirt-qemu kvm
diff --git a/mcp/config/states/neutron_compute b/mcp/config/states/neutron_compute
index d58162100..6266b0f18 100755
--- a/mcp/config/states/neutron_compute
+++ b/mcp/config/states/neutron_compute
@@ -2,3 +2,5 @@
set -x
salt -I 'neutron:compute' state.sls neutron
+salt -I 'neutron:compute' file.append /etc/sudoers.d/neutron_sudoers \
+ args='neutron ALL = (root) NOPASSWD: /usr/bin/neutron-rootwrap-daemon /etc/neutron/rootwrap.conf'
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
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml
index da4ecaf97..57d7f2054 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml
@@ -1,5 +1,7 @@
---
classes:
+ - system.linux.system.repo.mcp.openstack
+ - system.linux.system.repo.mcp.extra
- system.nova.compute.nfv.hugepages
- system.neutron.compute.nfv.dpdk
- cluster.virtual-mcp-ocata-common.openstack_compute
@@ -9,19 +11,7 @@ parameters:
compute:
backend:
tenant_network_types: ${_param:neutron_tenant_network_types}
- nova:
- compute:
- libvirt_service: libvirtd
- libvirt_bin: /etc/default/libvirtd
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
network:
interface:
dpdk0: