aboutsummaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-08-01 23:04:59 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-08-18 01:34:53 +0200
commitb9af498cb689f2018442461834c6f4013158500a (patch)
tree09b13381e17ea78194997b7d71fd125f2d8f197c /patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch
parent93f88afd749e2ce7a0e891c80e8dff276993f950 (diff)
p/fuel: Drop obsolete bootstrap-salt.sh workarounds
JIRA: ARMBAND-399 [1] https://github.com/saltstack/salt-bootstrap/pull/1251 Change-Id: Id3dccf6ae85e105f5e03eae69028da772954318c Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch')
-rw-r--r--patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch4
1 files changed, 2 insertions, 2 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 c21efeb..246ebdc 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
@@ -30,10 +30,10 @@ index a7e8fcde..81a8a2af 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 ed1d0649..e137e2c7 100644
+index 48f99ca5..bcc6695c 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml
-@@ -79,7 +79,7 @@ parameters:
+@@ -80,7 +80,7 @@ parameters:
server:
admin_email: ${_param:admin_email}
openrc_extra: