u/fuel: Bump & rebase for mongodb init

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

diff --git a/patches/opnfv-fuel/0003-mcp-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0003-mcp-salt-formulas-Add-enable-armband-formula.patch
index 843ea17..326cf11 100644 (file)
--- a/patches/opnfv-fuel/0003-mcp-salt-formulas-Add-enable-armband-formula.patch
+++ b/patches/opnfv-fuel/0003-mcp-salt-formulas-Add-enable-armband-formula.patch
@@ -67,7 +67,7 @@ index eaab135..050b648 100755
 +
 +salt -I 'nova:compute' state.sls armband
 diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
-index e507ec9..6c68e15 100755
+index b9db817..cec5895 100755
 --- a/mcp/config/states/openstack_ha
 +++ b/mcp/config/states/openstack_ha
 @@ -41,6 +41,7 @@ salt -I 'neutron:server' state.sls neutron -b 1
@@ -76,8 +76,8 @@ index e507ec9..6c68e15 100755
  salt -I 'nova:compute' state.sls nova
 +salt -I 'nova:compute' state.sls armband
 
- salt -I 'mongodb:server' state.sls mongodb -b 1
- salt -I 'aodh:server' state.sls aodh
+ salt -I 'mongodb:server' state.sls mongodb
+ while true; do sleep 5; salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin' && break; done
 diff --git a/mcp/salt-formulas/armband/files/nova-libvirt-driver.diff b/mcp/salt-formulas/armband/files/nova-libvirt-driver.diff
 new file mode 100644
 index 0000000..a5b08da

diff --git a/patches/opnfv-fuel/0007-classes-baremetal-AArch64-virtio-NIC-names-sync.patch b/patches/opnfv-fuel/0007-classes-baremetal-AArch64-virtio-NIC-names-sync.patch
index 39bc4df..2f25699 100644 (file)
--- a/patches/opnfv-fuel/0007-classes-baremetal-AArch64-virtio-NIC-names-sync.patch
+++ b/patches/opnfv-fuel/0007-classes-baremetal-AArch64-virtio-NIC-names-sync.patch
@@ -309,7 +309,7 @@ index f5312c1..d2e6a40 100644
 +        enp1s0: ${_param:linux_dhcp_interface}
 +        enp2s0: ${_param:linux_single_interface}
 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
-index ee5f639..345a7d4 100644
+index 4aa7bb0..118d22d 100644
 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
 @@ -17,7 +17,7 @@ classes:
@@ -599,7 +599,7 @@ index 881644b..f510a7b 100644
 +        enp1s0: ${_param:linux_dhcp_interface}
 +        enp2s0: ${_param:linux_single_interface}
 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
-index 30f2c46..72dac26 100644
+index 5e9a2c5..939fd7f 100644
 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
 @@ -17,7 +17,7 @@ classes:

diff --git a/patches/opnfv-fuel/0009-network-public-mgmt-Use-arm-pod3-POD-config.patch b/patches/opnfv-fuel/0009-network-public-mgmt-Use-arm-pod3-POD-config.patch
index 770b5f8..de10752 100644 (file)
--- a/patches/opnfv-fuel/0009-network-public-mgmt-Use-arm-pod3-POD-config.patch
+++ b/patches/opnfv-fuel/0009-network-public-mgmt-Use-arm-pod3-POD-config.patch
@@ -50,10 +50,10 @@ index 6c2ae04..787d713 100755
  wait_for 10 "salt -C 'mas01*' state.apply maas.region"
 
 diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
-index 6c68e15..99483f3 100755
+index cec5895..9714c70 100755
 --- a/mcp/config/states/openstack_ha
 +++ b/mcp/config/states/openstack_ha
-@@ -51,5 +51,5 @@ salt -I 'ceilometer:agent' state.sls ceilometer
+@@ -55,5 +55,5 @@ salt -I 'ceilometer:agent' state.sls ceilometer
  salt -I 'horizon:server' state.sls horizon
  salt -I 'nginx:server' state.sls nginx
 

diff --git a/upstream/fuel b/upstream/fuel
index f26e949..cde147c 160000 (submodule)
--- a/upstream/fuel
+++ b/upstream/fuel
@@ -1 +1 @@
-Subproject commit f26e94914200be045abfd10d63d7120e9e0f6145
+Subproject commit cde147cf3aec7f79b0a4d2bd60d01c355e5861ec