From b9af498cb689f2018442461834c6f4013158500a Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 1 Aug 2018 23:04:59 +0200 Subject: 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 --- patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch') 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 c21efebf..246ebdc9 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: -- cgit 1.2.3-korg