aboutsummaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
Diffstat (limited to 'mcp')
-rw-r--r--mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch2
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j25
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml4
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j24
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml3
-rw-r--r--mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/init.yml7
-rw-r--r--mcp/reclass/classes/cluster/mcp-ovn-noha/init.yml6
m---------mcp/salt-formulas/salt-formula-linux0
8 files changed, 2 insertions, 29 deletions
diff --git a/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch b/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch
index eb9daeb9e..1f31755b2 100644
--- a/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch
+++ b/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch
@@ -33,7 +33,7 @@ index 2c75586..d7d4c49 100644
ARG RECLASS_BASE="/srv/salt/reclass"
ENV RECLASS_BASE $RECLASS_BASE
- RUN echo "Layer python/salt module prerequisites, formulas" \
-+ RUN echo "Layer python/salt module prerequisites, formulas (22 Oct 2018)" \
++ RUN echo "Layer python/salt module prerequisites, formulas (23 Oct 2018)" \
&& mkdir -p /srv/salt \
&& curl -sSqL https://raw.githubusercontent.com/salt-formulas/salt-formulas-scripts/master/formula-fetch.sh -o /srv/salt/formula-fetch.sh \
&& bash -c 'source /srv/salt/formula-fetch.sh && setupPyEnv && fetchAll' \
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_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:
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 efdc2ffb1..0409974ba 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml
@@ -8,7 +8,6 @@
---
classes:
- service.nfs.client
- - system.linux.system.single.simple
- system.nova.compute.single
- service.cinder.volume.single
- system.cinder.volume.backend.lvm
@@ -85,5 +84,3 @@ parameters:
sysctl:
vm.dirty_ratio: 10
vm.dirty_background_ratio: 5
- ~boot_options:
- - ipv6.disable=0
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
diff --git a/mcp/salt-formulas/salt-formula-linux b/mcp/salt-formulas/salt-formula-linux
-Subproject cf1b5b322a077dc8d6f9bf5b36a7a0a71a2b3a0
+Subproject a0d8b2d8b108bff351d6ed60ad427dcbdccc57d