diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-10-19 15:36:02 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-10-23 12:09:16 +0400 |
| commit | 77a363ff192b806982eefa6cc5c91b24d2baa127 (patch) | |
| tree | 23b4a910b9b067aa282fce7e19dec42a07ff28aa /mcp/reclass/classes/cluster/mcp-common-ha | |
| parent | b6d00190ea2d1cc166b39f1db59912b3f572f248 (diff) | |
Enable IPv6 on entire cluster by default
IPv6 has been enabled back by commenting out the
cis-3-3-3 yaml/class source in linux service reclass.
Change-Id: Ia8f4e2ddbb98f9316e6ce5136badbb14ecb277c5
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-common-ha')
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml | 4 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2 | 4 |
2 files changed, 1 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 b9bf6aac6..c7338bb67 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml @@ -8,7 +8,6 @@ --- 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 @@ -67,10 +66,9 @@ 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-ha/openstack_proxy.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2 index ead2ac8de..7e038b16c 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2 @@ -8,7 +8,6 @@ --- classes: - system.linux.system.repo.mcp.mirror.v1.openstack - - system.linux.system.single.simple - system.nginx.server.single - system.nginx.server.proxy.openstack_api - system.nginx.server.proxy.openstack_vnc @@ -41,9 +40,6 @@ parameters: package: libapache2-mod-wsgi: version: latest - kernel: - ~boot_options: - - ipv6.disable=0 {%- if not conf.MCP_VCP %} nginx: server: |