[patch] Bump & rebase for pymysql update

Change-Id: I1cfe66962bf582a278412a648307f78fa9bc66c5
Signed-off-by: Delia Popescu <delia.popescu@enea.com>

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 36a0337..1fd80d2 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
@@ -17,18 +17,18 @@ 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 ceb3622b..49318588 100644
+index 38fe06a8..71bd80de 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
-@@ -127,7 +127,7 @@ parameters:
-     server:
+@@ -84,7 +84,7 @@ parameters:
+       <<: *db_conn_recycle_time
        cacert: /etc/ssl/certs/mcp_os_cacert
        openrc_extra:
 -        volume_device_name: vdc
 +        volume_device_name: sdc
-   haproxy:
-     proxy:
-       listen:
+   glance:
+     server:
+       <<: *db_conn_recycle_time
 diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml
 index f458281c..e17a5f16 100644
 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml

diff --git a/upstream/fuel b/upstream/fuel
index 8c6edbc..3772a3e 160000 (submodule)
--- a/upstream/fuel
+++ b/upstream/fuel
@@ -1 +1 @@
-Subproject commit 8c6edbc3875a1574175b7263b566c57704ea718a
+Subproject commit 3772a3e49e09f6cf9864c56a3ac0170cc0134329