aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-08-16 17:38:54 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-08-16 17:39:05 +0200
commitfd63f588ad1f87e49c10af3a7bd025cc57d76b95 (patch)
tree3dcd652e9c4bf3fe8c4e91a22cf2f725937d8054
parent24d9bf9ec8c1a4e6fae715b1849e355020dd0cd2 (diff)
u/fuel: Bump & rebase for barbican compute fix
Change-Id: Ia06dad8fe1511448750a37543f99841a02cf1c1d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch8
m---------upstream/fuel0
2 files changed, 4 insertions, 4 deletions
diff --git a/patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch b/patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch
index 3a3e69c..c21efeb 100644
--- a/patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch
+++ b/patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch
@@ -17,10 +17,10 @@ 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 f9fe73ae..a10ff801 100644
+index a7e8fcde..81a8a2af 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
-@@ -90,7 +90,7 @@ parameters:
+@@ -91,7 +91,7 @@ parameters:
<<: *db_conn_recycle_time
cacert: /etc/ssl/certs/mcp_os_cacert
openrc_extra:
@@ -30,10 +30,10 @@ index f9fe73ae..a10ff801 100644
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 8ba9c696..3cad66dc 100644
+index ed1d0649..e137e2c7 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml
-@@ -78,7 +78,7 @@ parameters:
+@@ -79,7 +79,7 @@ parameters:
server:
admin_email: ${_param:admin_email}
openrc_extra:
diff --git a/upstream/fuel b/upstream/fuel
-Subproject 8de9c24300817b9d0ce4f2bfb2ab63643d895a1
+Subproject c2902b924da9b2246ec80e7b541950b26ebc8cd