.../0103-virtng-module-Extend-libvirt_domain.patch | 54 ++++++++++++++++++++++
...4-salt-control-virt-Extend-libvirt_domain.patch | 51 ++++++++++++++++++++
mcp/patches/patches.list | 2 +
- .../baremetal-mcp-pike-common-ha/infra/kvm.yml | 15 ++++++
- .../baremetal-mcp-pike-odl-ha/infra/kvm.yml | 3 ++
+ .../cluster/mcp-pike-common-ha/infra/kvm.yml | 15 ++++++
+ .../cluster/mcp-pike-odl-ha/infra/kvm.yml.j2 | 3 ++
5 files changed, 125 insertions(+)
create mode 100644 mcp/patches/0103-virtng-module-Extend-libvirt_domain.patch
create mode 100644 mcp/patches/0104-salt-control-virt-Extend-libvirt_domain.patch
diff --git a/mcp/patches/0103-virtng-module-Extend-libvirt_domain.patch b/mcp/patches/0103-virtng-module-Extend-libvirt_domain.patch
new file mode 100644
-index 0000000..706b67d
+index 00000000..706b67da
--- /dev/null
+++ b/mcp/patches/0103-virtng-module-Extend-libvirt_domain.patch
@@ -0,0 +1,54 @@
+ for dev in kwargs['boot_dev'].split():
diff --git a/mcp/patches/0104-salt-control-virt-Extend-libvirt_domain.patch b/mcp/patches/0104-salt-control-virt-Extend-libvirt_domain.patch
new file mode 100644
-index 0000000..78eb0bf
+index 00000000..78eb0bff
--- /dev/null
+++ b/mcp/patches/0104-salt-control-virt-Extend-libvirt_domain.patch
@@ -0,0 +1,51 @@
+
+ #salt_control_seed_{{ cluster_name }}_{{ node_name }}:
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index 01e3224..e17a329 100644
+index 96025157..9ce1cc9c 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
-@@ -19,3 +19,5 @@
- /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch
- /usr/share/salt-formulas/env: 0013-dpdk-Support-ovs-bridge-tagging.patch
+@@ -17,3 +17,5 @@
+ /usr/share/salt-formulas/env: 0012-routes-Skip-network-restart-on-noifupdown.patch
+ /usr/share/salt-formulas/env: 0015-Set-ovs-bridges-as-L3-interfaces.patch
/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
+/usr/share/salt-formulas/env: 0103-virtng-module-Extend-libvirt_domain.patch
+/usr/share/salt-formulas/env: 0104-salt-control-virt-Extend-libvirt_domain.patch
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml
-index a604d0a..166b368 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml
-@@ -50,21 +50,33 @@ parameters:
+diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
+index 5bbe0fe4..84b392e6 100644
+--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
++++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
+@@ -53,21 +53,33 @@ parameters:
openstack.control:
cpu: 4
ram: 12288
disk_profile: xxlarge
net_profile: default
# stacklight.log:
-@@ -85,6 +97,9 @@ parameters:
+@@ -88,6 +100,9 @@ parameters:
openstack.proxy:
cpu: 2
ram: 2048
disk_profile: small
net_profile: default_ext
cluster:
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/kvm.yml
-index bbc80e2..8efebc7 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/kvm.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/kvm.yml
-@@ -17,6 +17,9 @@ parameters:
+diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2
+index 5fc4776d..b19789e3 100644
+--- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2
++++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2
+@@ -19,6 +19,9 @@ parameters:
opendaylight.server:
cpu: 4
- ram: 6144
+ ram: 8192
+ hw_firmware_type: uefi
+ virt_machine_model: virt
+ cpu_model: host-passthrough