aboutsummaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-21 18:42:04 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-21 18:42:58 +0100
commit17e0f24e018fc3fce2e46b5c6e4948f91ebe63d7 (patch)
treeb5e6aca5c0f81a3fdde1320a1bacf7a85c06695d /patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch
parent569c2cc53dc3a65140978c2bfa89db1500aba1a0 (diff)
u/fuel: Bump & rebase for upstream libvirtd socket
Change-Id: I4a5cb78eff164fe9984362b51c34a8359baa8a8d 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.patch12
1 files changed, 6 insertions, 6 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 eb4fb80..902ccef 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 0e1b7f6..ec9fc78 100644
+index ab9676d..5b06356 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
-@@ -17,3 +17,5 @@
+@@ -16,3 +16,5 @@
+ /usr/share/salt-formulas/env: 0011-maas-region-interface-default-mode-DHCP.patch
/usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch
- /usr/share/salt-formulas/env: 0013-libvirt-unix_sock_group-s-libvirtd-libvirt.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 23f09a7..b28f479 100644
+index 35157e4..8c0fd73 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
-@@ -48,21 +48,33 @@ parameters:
+@@ -49,21 +49,33 @@ parameters:
openstack.control:
cpu: 4
ram: 12288
@@ -197,7 +197,7 @@ index 23f09a7..b28f479 100644
disk_profile: xxlarge
net_profile: default
# stacklight.log:
-@@ -83,6 +95,9 @@ parameters:
+@@ -84,6 +96,9 @@ parameters:
openstack.proxy:
cpu: 2
ram: 2048