u/fuel: Bump & rebase for MaaS region fabric

Change-Id: Iddd9591507b3985625cce31c3740deabd3eeded2
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/.gitreview b/.gitreview
index cc44ef1..f68d5e2 100644 (file)
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,4 @@
 host=gerrit.opnfv.org
 port=29418
 project=armband.git
-defaultbranch=master
+defaultbranch=stable/fraser

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 6a2af3c..185a335 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
@@ -26,15 +26,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 +
- .../armband/files/nova-libvirt-aarch64-rollup.diff | 106 +++++++++++++++++++++
- 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 +
+ .../files/nova-libvirt-aarch64-rollup.diff    | 106 ++++++++++++++++++
+ 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, 168 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/0003-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0003-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
index 37fb9dd..07c447b 100644 (file)
--- a/patches/opnfv-fuel/0003-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0003-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 +
- .../armband/files/salt-minion-aarch64-rollup.diff  | 101 +++++++++++++++++++++
- mcp/salt-formulas/armband/salt_minion.sls          |   7 ++
+ mcp/config/states/baremetal_init              |   1 +
+ .../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/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch
index 7dc5fb6..23a4dcf 100644 (file)
--- a/patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch
@@ -23,11 +23,11 @@ specific values.
 
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- .../0103-virtng-module-Extend-libvirt_domain.patch | 54 ++++++++++++++++++++++
- ...4-salt-control-virt-Extend-libvirt_domain.patch | 51 ++++++++++++++++++++
- mcp/patches/patches.list                           |  2 +
- .../cluster/mcp-pike-common-ha/infra/kvm.yml       | 15 ++++++
- .../cluster/mcp-pike-odl-ha/infra/kvm.yml.j2       |  3 ++
+ ...-virtng-module-Extend-libvirt_domain.patch | 54 +++++++++++++++++++
+ ...t-control-virt-Extend-libvirt_domain.patch | 51 ++++++++++++++++++
+ mcp/patches/patches.list                      |  2 +
+ .../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
@@ -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 fbc671f3..51c9f437 100644
+index bd57ecdb..1d8a8910 100644
 --- a/mcp/patches/patches.list
 +++ b/mcp/patches/patches.list
-@@ -14,3 +14,5 @@
+@@ -13,3 +13,5 @@
  /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

diff --git a/patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch b/patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch
index 1b2da2d..21e1bca 100644 (file)
--- a/patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch
+++ b/patches/opnfv-fuel/0006-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-pike-common-ha/openstack_control.yml.j2     | 2 +-
- .../classes/cluster/mcp-pike-common-noha/openstack_control.yml      | 6 ++++++
+ .../cluster/mcp-pike-common-ha/openstack_control.yml.j2     | 2 +-
+ .../cluster/mcp-pike-common-noha/openstack_control.yml      | 6 ++++++
  2 files changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2

diff --git a/upstream/fuel b/upstream/fuel
index c6de902..c016116 160000 (submodule)
--- a/upstream/fuel
+++ b/upstream/fuel
@@ -1 +1 @@
-Subproject commit c6de9021d6b387e24363dcf4eb35692ef82d439f
+Subproject commit c0161169de2a8e149818c277d19f00fe95d3b1fc