aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/patches/salt-formula-maas
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-11-08 19:06:46 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2019-01-10 15:22:59 +0100
commit6eaeafea81f30ee66f2c187596815a0166f1132b (patch)
treeab296858aac68b09b2a905486aa072dc8c304e0c /mcp/patches/salt-formula-maas
parent920d7ef405e9fed9af7b0576b94f6d19fe265c81 (diff)
[noha] Bring in FDIO (VPP+DPDK) scenario
- cmp, gtw: bump RAM allocation to accomodate hugepages/VPP; for now we overcommit, gtw01 resources can probably be lowered; - submodule: add salt-formula-neutron so we can locally patch it; - repo: * FD.IO repos for VPP packages; * networking-vpp PPA for python-networking-vpp Neutron driver; - use vpp-router for L3, disable neutron-l3-agent; - baremetal_init: apply repo config before network (otherwise UCA repo is missing when trying to install DPDK on baremetal nodes); - arm64: iommu.passthrough=1 is required on ThunderX for VPP on newer kernels; Design quirks: - vpp service runs as 'neutron' user, which does not exist at the time VPP is installed and initially started, hence the need to restart it before starting the vpp-agent service; - gtw01 node has DPDK, yet to configure it via IDF we use the compute-specific OVS-targeted parameters like `compute_ovs_dpdk_socket_mem`, which is a bit misleading; - vpp-agent requires ml2_conf.ini on ALL compute AND network nodes to parse per-node physnet-to-real interface names; - vpp process is bound to core '1' (not parameterized via IDF); Change-Id: I659f7dbebcab7b154e7b1fb829cd7159b4372ec8 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 455b46a6be4bca145c047ed6957727c119285796)
Diffstat (limited to 'mcp/patches/salt-formula-maas')
-rw-r--r--mcp/patches/salt-formula-maas/0005-Implement-tags-support.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/mcp/patches/salt-formula-maas/0005-Implement-tags-support.patch b/mcp/patches/salt-formula-maas/0005-Implement-tags-support.patch
index 77d8ff789..89b25be61 100644
--- a/mcp/patches/salt-formula-maas/0005-Implement-tags-support.patch
+++ b/mcp/patches/salt-formula-maas/0005-Implement-tags-support.patch
@@ -18,7 +18,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
3 files changed, 39 insertions(+)
diff --git a/README.rst b/README.rst
-index 78d8aef..8c35458 100644
+index 88d3358..6f5563f 100644
--- a/README.rst
+++ b/README.rst
@@ -181,6 +181,11 @@ Single MAAS region service [single UI/API]:
@@ -34,7 +34,7 @@ index 78d8aef..8c35458 100644
# domain: mydomain.local # This function broken
http_proxy: http://192.168.0.10:3142
diff --git a/_modules/maas.py b/_modules/maas.py
-index 28e46c5..f56ed34 100644
+index c02f104..ef7511e 100644
--- a/_modules/maas.py
+++ b/_modules/maas.py
@@ -876,6 +876,28 @@ class Domain(MaasObject):
@@ -66,7 +66,7 @@ index 28e46c5..f56ed34 100644
class MachinesStatus(MaasObject):
@classmethod
def execute(cls, objects_name=None):
-@@ -1064,5 +1086,9 @@ def process_sshprefs():
+@@ -1025,5 +1047,9 @@ def process_sshprefs():
return SSHPrefs().process()
@@ -77,10 +77,10 @@ index 28e46c5..f56ed34 100644
def wait_for_machine_status(**kwargs):
return MachinesStatus.wait_for_machine_status(**kwargs)
diff --git a/maas/region.sls b/maas/region.sls
-index 4a7f6cc..52fb952 100644
+index 5da3a7f..0b47fe4 100644
--- a/maas/region.sls
+++ b/maas/region.sls
-@@ -444,4 +444,12 @@ maas_sshkey_{{ idx }}:
+@@ -442,4 +442,12 @@ maas_sshkey_{{ idx }}:
{% endfor %}
{%- endif %}