u/fuel: Bump & rebase for net_config ip-range

JIRA: FUEL-351

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

1 files changed, 9 insertions, 9 deletions

diff --git a/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch
index 21bf4cba..c1f1b03e 100644
--- a/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch
+++ b/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch
@@ -44,7 +44,7 @@ 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 4f3760f..115a56c 100755
+index 4f3760f6..115a56c1 100755
 --- a/mcp/config/states/openstack_ha
 +++ b/mcp/config/states/openstack_ha
 @@ -52,6 +52,7 @@ salt -I 'neutron:server' state.sls neutron -b 1
@@ -56,7 +56,7 @@ index 4f3760f..115a56c 100755
  salt -C 'I@mongodb:server and *01*' state.sls mongodb || true
  wait_for 10 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'"
 diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha
-index 9fc30bb..998fc6b 100755
+index 9fc30bbf..998fc6b4 100755
 --- a/mcp/config/states/openstack_noha
 +++ b/mcp/config/states/openstack_noha
 @@ -52,6 +52,8 @@ salt -I 'ceilometer:agent' state.sls ceilometer
@@ -69,7 +69,7 @@ index 9fc30bb..998fc6b 100755
  salt -I 'horizon:server' file.symlink \
    /var/lib/openstack-dashboard/static \
 diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index 48e45d4..afdfb4f 100755
+index 80c0c87e..144245f9 100755
 --- a/mcp/config/states/virtual_control_plane
 +++ b/mcp/config/states/virtual_control_plane
 @@ -27,6 +27,7 @@ if [ "${ERASE_ENV}" -eq 1 ]; then
@@ -82,7 +82,7 @@ index 48e45d4..afdfb4f 100755
  salt -C 'kvm* or cmp*' state.apply salt
 diff --git a/mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff b/mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff
 new file mode 100644
-index 0000000..36ddf72
+index 00000000..36ddf72b
 --- /dev/null
 +++ b/mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff
 @@ -0,0 +1,76 @@
@@ -164,7 +164,7 @@ index 0000000..36ddf72
 +         if image_meta.properties.get('hw_video_model'):
 diff --git a/mcp/salt-formulas/armband/init.sls b/mcp/salt-formulas/armband/init.sls
 new file mode 100644
-index 0000000..8a8cf2a
+index 00000000..8a8cf2ab
 --- /dev/null
 +++ b/mcp/salt-formulas/armband/init.sls
 @@ -0,0 +1,7 @@
@@ -177,7 +177,7 @@ index 0000000..8a8cf2a
 + {%- endif %}
 diff --git a/mcp/salt-formulas/armband/nova_config.sls b/mcp/salt-formulas/armband/nova_config.sls
 new file mode 100644
-index 0000000..31fa031
+index 00000000..31fa031a
 --- /dev/null
 +++ b/mcp/salt-formulas/armband/nova_config.sls
 @@ -0,0 +1,35 @@
@@ -218,7 +218,7 @@ index 0000000..31fa031
 +    - name: "service nova-compute restart"
 diff --git a/mcp/salt-formulas/armband/nova_libvirt.sls b/mcp/salt-formulas/armband/nova_libvirt.sls
 new file mode 100644
-index 0000000..bc2cbda
+index 00000000..bc2cbda9
 --- /dev/null
 +++ b/mcp/salt-formulas/armband/nova_libvirt.sls
 @@ -0,0 +1,7 @@
@@ -231,7 +231,7 @@ index 0000000..bc2cbda
 +  - unless: 'test -f /var/cache/salt/minion/files/base/armband/files/nova-libvirt-aarch64-rollup.diff && cd /usr/lib/python2.7/dist-packages && patch -p1 -R --dry-run /var/cache/salt/minion/files/base/armband/files/nova-libvirt-aarch64-rollup.diff'
 diff --git a/mcp/salt-formulas/armband/qemu_efi.sls b/mcp/salt-formulas/armband/qemu_efi.sls
 new file mode 100644
-index 0000000..c697dae
+index 00000000..c697dae9
 --- /dev/null
 +++ b/mcp/salt-formulas/armband/qemu_efi.sls
 @@ -0,0 +1,2 @@
@@ -239,7 +239,7 @@ index 0000000..c697dae
 +  pkg.installed
 diff --git a/mcp/salt-formulas/armband/vgabios.sls b/mcp/salt-formulas/armband/vgabios.sls
 new file mode 100644
-index 0000000..500c2bc
+index 00000000..500c2bcf
 --- /dev/null
 +++ b/mcp/salt-formulas/armband/vgabios.sls
 @@ -0,0 +1,7 @@