diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-02 06:03:48 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-03 04:54:04 +0100 |
| commit | bf5e0b539fafdc2bf26bb1b0d49327f851c62fb3 (patch) | |
| tree | 44a6ef37ba38cb93ef7b2522f346ca6848121c37 /patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch | |
| parent | 6eab8c989c257213586347f284362cc43f99d3f4 (diff) | |
u/fuel: Bump & rebase for MaaS proxy support
While at it, fix duplicate "file.repl" entry in armband.nova_config
SLS and drop upstream nova patch for Qemu 2.10 support previously
backported.
Fixes: f191bfb
Change-Id: Ib4e56833df8e1095396af0856a0fad06f5e9ed1c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch')
| -rw-r--r-- | patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch index ec0a4fa5..650dc80c 100644 --- a/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch @@ -150,20 +150,20 @@ index 0000000..a9fe11b + + #salt_control_seed_{{ cluster_name }}_{{ node_name }}: diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index fc2ddea..fdd3872 100644 +index 00a4828..c69567b 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -15,3 +15,5 @@ +@@ -16,3 +16,5 @@ /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.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 35157e4..8c0fd73 100644 +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 -@@ -49,21 +49,33 @@ parameters: +@@ -50,21 +50,33 @@ parameters: openstack.control: cpu: 4 ram: 12288 @@ -197,7 +197,7 @@ index 35157e4..8c0fd73 100644 disk_profile: xxlarge net_profile: default # stacklight.log: -@@ -84,6 +96,9 @@ parameters: +@@ -85,6 +97,9 @@ parameters: openstack.proxy: cpu: 2 ram: 2048 |