diff options
Diffstat (limited to 'mcp/reclass/classes')
6 files changed, 2 insertions, 24 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 index e16453e03..fb45b13fe 100644 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 @@ -10,7 +10,6 @@ # NOTE: pod_config is generated and transferred into its final location on # cfg01 only during deployment to prevent leaking sensitive data classes: - - system.linux.system.single.simple - system.maas.region.single - service.maas.cluster.single - cluster.all-mcp-arch-common.opnfv.lab_proxy_pdf @@ -107,10 +106,6 @@ parameters: cluster: saltstack_repo_xenial: "deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7/ xenial main" linux: - system: - kernel: - ~boot_options: - - ipv6.disable=0 network: interface: mcpcontrol_interface: diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 index 25521f9c8..03610a64e 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 @@ -92,7 +92,7 @@ parameters: <<: *db_conn_recycle_time cacert: /etc/ssl/certs/mcp_os_cacert openrc_extra: - volume_device_name: vdc + volume_device_name: sdc glance: server: <<: *db_conn_recycle_time 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 759bdc1ba..c23b50993 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 @@ -40,9 +39,6 @@ parameters: package: libapache2-mod-wsgi: version: latest - kernel: - ~boot_options: - - ipv6.disable=0 {%- if not conf.MCP_VCP %} nginx: server: diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 index d1caafe45..2f7e39d87 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 @@ -85,7 +85,7 @@ parameters: server: admin_email: ${_param:admin_email} openrc_extra: - volume_device_name: vdc + volume_device_name: sdc pkgs: - keystone - python-psycopg2 diff --git a/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/init.yml index ec0d36cf2..737af52e3 100644 --- a/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/init.yml +++ b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/init.yml @@ -11,10 +11,3 @@ classes: parameters: _param: neutron_tenant_network_types: "geneve,flat" - linux: - system: - kernel: - ~boot_options: - - ipv6.disable=0 - - spectre_v2=off - - nopti diff --git a/mcp/reclass/classes/cluster/mcp-ovn-noha/init.yml b/mcp/reclass/classes/cluster/mcp-ovn-noha/init.yml index 49e7e46eb..82f4632bd 100644 --- a/mcp/reclass/classes/cluster/mcp-ovn-noha/init.yml +++ b/mcp/reclass/classes/cluster/mcp-ovn-noha/init.yml @@ -10,9 +10,3 @@ classes: - cluster.mcp-common-noha.init_options - cluster.mcp-ovn-noha.infra - cluster.mcp-ovn-noha.openstack -parameters: - linux: - system: - kernel: - ~boot_options: - - ipv6.disable=0 |