aboutsummaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorDelia Popescu <delia.popescu@enea.com>2018-06-25 14:41:50 +0300
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-06-25 13:59:46 +0200
commit85efa248f9aab958369c44e6da4c9b0cbba4da3b (patch)
tree1422bf430a21258fcc6681b89f07645cabbb5c14 /patches
parent76fc13c29603e5d43e84d8cf6f504c6460afce08 (diff)
[patch] Bump & rebase for pymysql update
Change-Id: I1cfe66962bf582a278412a648307f78fa9bc66c5 Signed-off-by: Delia Popescu <delia.popescu@enea.com>
Diffstat (limited to 'patches')
-rw-r--r--patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch12
1 files changed, 6 insertions, 6 deletions
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
--- 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