u/fuel: Bump & rebase for maasng boot-resources 89/58989/1
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Mon, 25 Jun 2018 12:58:29 +0000 (14:58 +0200)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Mon, 25 Jun 2018 13:00:09 +0000 (15:00 +0200)
Change-Id: I067fcde1bff66d100b1d052820217065fec2ea38
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch
upstream/fuel

index ef3a6f8..0753ad0 100644 (file)
@@ -150,13 +150,13 @@ index 00000000..78eb0bff
 +
 + #salt_control_seed_{{ cluster_name }}_{{ node_name }}:
 diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index fbc671f3..51c9f437 100644
+index 4d22c617..e6827aa2 100644
 --- a/mcp/patches/patches.list
 +++ b/mcp/patches/patches.list
-@@ -14,3 +14,5 @@
+@@ -12,3 +12,5 @@
+ /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch
  /usr/share/salt-formulas/env: 0011-system.repo-Debian-Add-keyserver-proxy-support.patch
  /usr/share/salt-formulas/env: 0015-Set-ovs-bridges-as-L3-interfaces.patch
- /usr/share/salt-formulas/env: 0016-Set-boot-source-selections.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/mcp-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml
index 3772a3e..3ed2d8d 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 3772a3e49e09f6cf9864c56a3ac0170cc0134329
+Subproject commit 3ed2d8dab3d75628cd1f7edd47051623c643592c