summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mcp/config/scenario/defaults-x86_64.yaml1
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml2
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml3
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute.yml1
4 files changed, 6 insertions, 1 deletions
diff --git a/mcp/config/scenario/defaults-x86_64.yaml b/mcp/config/scenario/defaults-x86_64.yaml
index 18b0826f9..b9c407280 100644
--- a/mcp/config/scenario/defaults-x86_64.yaml
+++ b/mcp/config/scenario/defaults-x86_64.yaml
@@ -20,6 +20,7 @@ virtual:
- saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11 xenial main
pkg:
install:
+ - linux-generic-hwe-16.04
- salt-minion
control:
pkg:
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml
index 1fd5987b8..e14d2a968 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml
@@ -24,7 +24,7 @@ parameters:
maas_db_password: opnfv_secret
dns_server01: ${_param:opnfv_dns_server01}
single_address: ${_param:infra_maas_node01_deploy_address}
- hwe_kernel: 'ga-16.04'
+ hwe_kernel: 'hwe-16.04'
maas:
region:
salt_master_ip: ${_param:reclass_config_master}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
index 7f81d7a72..2e79f808e 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
@@ -56,3 +56,6 @@ parameters:
neutron:
gateway:
vlan_aware_vms: true
+ nova:
+ compute:
+ disk_cachemodes: file=directsync,block=none
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute.yml
index 710dee8e7..ea2275a3e 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute.yml
@@ -25,6 +25,7 @@ parameters:
compute:
libvirt_service: libvirtd
libvirt_bin: /etc/default/libvirtd
+ disk_cachemodes: file=directsync,block=none
vncproxy_url: http://${_param:cluster_vip_address}:6080
network:
region: ${_param:openstack_region}