u/fuel: Bump & rebase for _orchestration.conf fix

Change-Id: Ifb4ba7e0bb06b214e682e76ec3204c7e5d411f05
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 b98bdc9..1e98654 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
@@ -64,7 +64,7 @@ index 70db238b..52d643df 100755
 +
 +salt -I 'nova:compute' state.sls armband
 diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index 18e6d1cd..64d73953 100755
+index 8105b266..cc227a97 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

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..cc405a1 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,11 +41,11 @@ 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 6a44b788..6f935445 100755
+index 3e5f659f..674a1bfd 100755
 --- a/mcp/config/states/baremetal_init
 +++ b/mcp/config/states/baremetal_init
-@@ -31,6 +31,7 @@ wait_for 5.0 "salt -C 'kvm* or cmp*' state.apply opnfv.route_wrapper"
- wait_for 5.0 "salt -C 'cmp*' state.apply linux.network"
+@@ -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"
 
 +salt -C 'kvm*' state.apply armband.salt_minion

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..8f2e901 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,7 +22,7 @@ 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 6f935445..f685ab87 100755
+index 674a1bfd..0b24acd6 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 \
@@ -32,9 +32,9 @@ index 6f935445..f685ab87 100755
 +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"
+ wait_for 5.0 "salt -C 'cmp*' state.apply linux.system,linux.network"
 diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index 64d73953..d8c4e776 100755
+index cc227a97..51823a0c 100755
 --- a/mcp/config/states/virtual_control_plane
 +++ b/mcp/config/states/virtual_control_plane
 @@ -39,6 +39,7 @@ vcp_nodes=$(salt --out yaml 'kvm01*' pillar.get salt:control:cluster:internal:no

diff --git a/upstream/fuel b/upstream/fuel
index 24572d5..8ac1c0f 160000 (submodule)
--- a/upstream/fuel
+++ b/upstream/fuel
@@ -1 +1 @@
-Subproject commit 24572d5956da62b1492c053cac82037b266a6739
+Subproject commit 8ac1c0fa491ab5de2eaf128374f9c73202df1751