u/fuel: Bump & rebase for MaaS fix

Change-Id: I8f764844d4e437d7677abe1239c7a9e74c6dbf5a
Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>

diff --git a/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch
index b98bdc9..e7a94a3 100644 (file)
--- a/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch
+++ b/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch
@@ -24,15 +24,15 @@ Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
 Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- mcp/config/states/openstack_ha                |  1 +
- mcp/config/states/openstack_noha              |  2 ++
- mcp/config/states/virtual_control_plane       |  1 +
- .../files/nova-libvirt-aarch64-rollup.diff    | 27 ++++++++++++++
- mcp/salt-formulas/armband/init.sls            |  7 ++++
- mcp/salt-formulas/armband/nova_config.sls     | 35 +++++++++++++++++++
- mcp/salt-formulas/armband/nova_libvirt.sls    |  7 ++++
- mcp/salt-formulas/armband/qemu_efi.sls        |  2 ++
- mcp/salt-formulas/armband/vgabios.sls         |  7 ++++
+ mcp/config/states/openstack_ha                     |  1 +
+ mcp/config/states/openstack_noha                   |  2 ++
+ mcp/config/states/virtual_control_plane            |  1 +
+ .../armband/files/nova-libvirt-aarch64-rollup.diff | 27 +++++++++++++++++
+ mcp/salt-formulas/armband/init.sls                 |  7 +++++
+ mcp/salt-formulas/armband/nova_config.sls          | 35 ++++++++++++++++++++++
+ mcp/salt-formulas/armband/nova_libvirt.sls         |  7 +++++
+ mcp/salt-formulas/armband/qemu_efi.sls             |  2 ++
+ mcp/salt-formulas/armband/vgabios.sls              |  7 +++++
  9 files changed, 89 insertions(+)
  create mode 100644 mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff
  create mode 100644 mcp/salt-formulas/armband/init.sls

diff --git a/patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
index 086cfca..82f7851 100644 (file)
--- a/patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
@@ -33,9 +33,9 @@ to pick up the changes, so we'll run it before rebooting kvm nodes.
 
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- mcp/config/states/baremetal_init              |   1 +
- .../files/salt-minion-aarch64-rollup.diff     | 101 ++++++++++++++++++
- mcp/salt-formulas/armband/salt_minion.sls     |   7 ++
+ mcp/config/states/baremetal_init                   |   1 +
+ .../armband/files/salt-minion-aarch64-rollup.diff  | 101 +++++++++++++++++++++
+ mcp/salt-formulas/armband/salt_minion.sls          |   7 ++
  3 files changed, 109 insertions(+)
  create mode 100644 mcp/salt-formulas/armband/files/salt-minion-aarch64-rollup.diff
  create mode 100644 mcp/salt-formulas/armband/salt_minion.sls

diff --git a/patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch
index 11abe1d..be0d9df 100644 (file)
--- a/patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch
@@ -23,11 +23,11 @@ specific values.
 
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- ...-virtng-module-Extend-libvirt_domain.patch | 54 +++++++++++++++++++
- ...t-control-virt-Extend-libvirt_domain.patch | 51 ++++++++++++++++++
- mcp/patches/patches.list                      |  2 +
- .../cluster/mcp-common-ha/infra/kvm.yml       | 15 ++++++
- .../cluster/mcp-odl-ha/infra/kvm.yml.j2       |  3 ++
+ .../0103-virtng-module-Extend-libvirt_domain.patch | 54 ++++++++++++++++++++++
+ ...4-salt-control-virt-Extend-libvirt_domain.patch | 51 ++++++++++++++++++++
+ mcp/patches/patches.list                           |  2 +
+ .../classes/cluster/mcp-common-ha/infra/kvm.yml    | 15 ++++++
+ .../classes/cluster/mcp-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
@@ -150,10 +150,10 @@ index 00000000..78eb0bff
 +
 + #salt_control_seed_{{ cluster_name }}_{{ node_name }}:
 diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index a17fd694..6dd688ee 100644
+index baa15d79..c9dbe24a 100644
 --- a/mcp/patches/patches.list
 +++ b/mcp/patches/patches.list
-@@ -11,3 +11,5 @@
+@@ -10,3 +10,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

diff --git a/patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch
index f158ed4..e81af01 100644 (file)
--- a/patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch
+++ b/patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch
@@ -14,10 +14,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
 Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
 ---
- mcp/config/states/baremetal_init                           | 1 +
- mcp/config/states/virtual_control_plane                    | 1 +
- .../classes/cluster/all-mcp-arch-common/init.yml.j2        | 3 +++
- mcp/salt-formulas/opnfv/adduser.sls                        | 7 +++++++
+ mcp/config/states/baremetal_init                            | 1 +
+ mcp/config/states/virtual_control_plane                     | 1 +
+ mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 | 3 +++
+ mcp/salt-formulas/opnfv/adduser.sls                         | 7 +++++++
  4 files changed, 12 insertions(+)
  create mode 100644 mcp/salt-formulas/opnfv/adduser.sls
 

diff --git a/patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch b/patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch
index 0cfae94..01aa5b0 100644 (file)
--- a/patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch
+++ b/patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch
@@ -12,8 +12,8 @@ Subject: [PATCH] Set volume name in source file to sdX
 
 Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
 ---
- .../classes/cluster/mcp-common-ha/openstack_control.yml.j2      | 2 +-
- .../classes/cluster/mcp-common-noha/openstack_control.yml       | 2 +-
+ mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 | 2 +-
+ mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml  | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2

diff --git a/upstream/fuel b/upstream/fuel
index 3831d53..b03bc91 160000 (submodule)
--- a/upstream/fuel
+++ b/upstream/fuel
@@ -1 +1 @@
-Subproject commit 3831d538436cbf7c033b560b76f554a1dfe28a4c
+Subproject commit b03bc918a67f86d6a89441739f4a2952993c9e67