u/fuel: Bump & rebase for Salt 2017.7 bump

Change-Id: Ia69496c0dfed2ac47b9d72f51e9d16956fe07c58
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@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 1714fda..6ece82b 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
@@ -42,10 +42,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  create mode 100644 mcp/salt-formulas/armband/vgabios.sls
 
 diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
-index a32111f6..6fff4368 100755
+index 12d6ae65..c122ca0a 100755
 --- a/mcp/config/states/openstack_ha
 +++ b/mcp/config/states/openstack_ha
-@@ -55,6 +55,7 @@ if salt 'cmp*' match.pillar 'neutron:compute' --out yaml --static  | grep -q -e
+@@ -56,6 +56,7 @@ if salt 'cmp*' match.pillar 'neutron:compute:backend:engine:ovn' \
  fi
 
  salt -I 'nova:compute' state.sls nova

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 cc405a1..8fb84e1 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
@@ -41,16 +41,16 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  create mode 100644 mcp/salt-formulas/armband/salt_minion.sls
 
 diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init
-index 3e5f659f..674a1bfd 100755
+index 358e1874..14d6a570 100755
 --- a/mcp/config/states/baremetal_init
 +++ b/mcp/config/states/baremetal_init
-@@ -28,6 +28,7 @@ wait_for 5.0 "salt -C 'kvm* or cmp*' state.apply salt.minion"
- wait_for 5.0 "salt -C 'cmp*' state.apply linux.system,linux.network"
- wait_for 30.0 "salt -C 'kvm* or cmp*' test.ping"
+@@ -32,6 +32,7 @@ wait_for 5.0 "salt -C '${cluster_nodes_query}' state.apply salt.minion"
+ wait_for 5.0 "salt -C '${compute_nodes_query}' state.apply linux.system,linux.network"
+ wait_for 30.0 "salt -C '${cluster_nodes_query}' test.ping"
 
-+salt -C 'kvm*' state.apply armband.salt_minion
- salt -C 'kvm* or cmp*' system.reboot
- wait_for 90.0 "salt -C 'kvm* or cmp*' test.ping"
++salt -C "${control_nodes_query}" state.apply armband.salt_minion
+ salt -C "${cluster_nodes_query}" system.reboot
+ wait_for 90.0 "salt -C '${cluster_nodes_query}' test.ping"
 
 diff --git a/mcp/salt-formulas/armband/files/salt-minion-aarch64-rollup.diff b/mcp/salt-formulas/armband/files/salt-minion-aarch64-rollup.diff
 new file mode 100644

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 8480a66..3b366e4 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
@@ -150,17 +150,17 @@ index 00000000..78eb0bff
 +
 + #salt_control_seed_{{ cluster_name }}_{{ node_name }}:
 diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index baa15d79..c9dbe24a 100644
+index 2f910715..5ebc1d30 100644
 --- a/mcp/patches/patches.list
 +++ b/mcp/patches/patches.list
-@@ -10,3 +10,5 @@
- /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch
+@@ -11,3 +11,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-Disable-glance-signature-verification.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 868f324f..73875b87 100644
+index 62af0893..bda52803 100644
 --- a/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml
 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml
 @@ -52,21 +52,33 @@ parameters:

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 8f2e901..9a23ac1 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
@@ -22,17 +22,17 @@ Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
  create mode 100644 mcp/salt-formulas/opnfv/adduser.sls
 
 diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init
-index 674a1bfd..0b24acd6 100755
+index 14d6a570..1317900a 100755
 --- a/mcp/config/states/baremetal_init
 +++ b/mcp/config/states/baremetal_init
-@@ -23,6 +23,7 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \
+@@ -27,6 +27,7 @@ salt -C "${cluster_nodes_query}" file.replace $debian_ip_source \
    repl="\n        if not __salt__['pkg.version']('vlan'):\n            __salt__['pkg.install']('vlan')"
 
- salt -C 'kvm* or cmp*' pkg.install bridge-utils
-+salt -C 'kvm* or cmp*' state.apply opnfv.adduser
- salt -C 'kvm*' state.apply linux.network,linux.system.kernel
- wait_for 5.0 "salt -C 'kvm* or cmp*' state.apply salt.minion"
- wait_for 5.0 "salt -C 'cmp*' state.apply linux.system,linux.network"
+ salt -C "${cluster_nodes_query}" pkg.install bridge-utils
++salt -C "${control_nodes_query}" state.apply opnfv.adduser
+ salt -C "${control_nodes_query}" state.apply linux.network,linux.system.kernel
+ wait_for 5.0 "salt -C '${cluster_nodes_query}' state.apply salt.minion"
+ wait_for 5.0 "salt -C '${compute_nodes_query}' state.apply linux.system,linux.network"
 diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
 index cc227a97..51823a0c 100755
 --- a/mcp/config/states/virtual_control_plane
@@ -46,10 +46,10 @@ index cc227a97..51823a0c 100755
 
  # Propagate APT proxy config created by curtin on baremetal nodes to VCP VMs
 diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2
-index 19475c71..1a3c84fc 100644
+index 987c5eb2..afeadc80 100644
 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2
 +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2
-@@ -10,6 +10,9 @@ classes:
+@@ -11,6 +11,9 @@ classes:
    - cluster.all-mcp-arch-common.opnfv
  parameters:
    _param:

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 0a19c02..cc1c5aa 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
@@ -17,7 +17,7 @@ Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
  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
-index 28d727ea..edf91162 100644
+index 33c74fda..4e728dc4 100644
 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
 @@ -89,7 +89,7 @@ parameters:

diff --git a/upstream/fuel b/upstream/fuel
index 7fe07e3..544ff4f 160000 (submodule)
--- a/upstream/fuel
+++ b/upstream/fuel
@@ -1 +1 @@
-Subproject commit 7fe07e31a3aca294b4093ba238ce648fa4cb0f38
+Subproject commit 544ff4f35b2b449d25272a8805bbb4c7f748f1d4