diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-10-29 15:18:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-10-29 15:18:07 +0000 |
| commit | d9988cc10efd379c2d53778c67f6b035f2719001 (patch) | |
| tree | afb85e195dd56f8f819bff9a1c7db2d431d6f429 /mcp | |
| parent | ffffbb301fc9a3a89edf7f6b71d3fb39a5ccd0db (diff) | |
| parent | ea3e08bfe63970ac13738d995a86fd41337ec900 (diff) | |
Merge "Enable IPv6 on compute nodes for noha and ha" into stable/gambia
Diffstat (limited to 'mcp')
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml | 4 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml | 3 |
2 files changed, 6 insertions, 1 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 c7338bb67..b9bf6aac6 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml @@ -8,6 +8,7 @@ --- classes: - system.linux.system.repo.mcp.mirror.v1.openstack + - system.linux.system.single.simple - system.glusterfs.client.cluster - system.nova.compute.cluster - system.nova.compute.nfv.hugepages @@ -66,9 +67,10 @@ parameters: sysctl: vm.dirty_ratio: 10 vm.dirty_background_ratio: 5 - boot_options: + ~boot_options: - spectre_v2=off - nopti + - ipv6.disable=0 neutron: gateway: vlan_aware_vms: true diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml index 0409974ba..efdc2ffb1 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml @@ -8,6 +8,7 @@ --- classes: - service.nfs.client + - system.linux.system.single.simple - system.nova.compute.single - service.cinder.volume.single - system.cinder.volume.backend.lvm @@ -84,3 +85,5 @@ parameters: sysctl: vm.dirty_ratio: 10 vm.dirty_background_ratio: 5 + ~boot_options: + - ipv6.disable=0 |