u/fuel: Bump & rebase for static PXE/admin IPs

[armband.git] / patches / opnfv-fuel / 0006-Set-volume-name-in-source-file-to-sdX.patch

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 458a84c..36a0337 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,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 1870cc46..6378f77d 100644
+index ceb3622b..49318588 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
-@@ -130,7 +130,7 @@ parameters:
+@@ -127,7 +127,7 @@ parameters:
      server:
        cacert: /etc/ssl/certs/mcp_os_cacert
        openrc_extra:
@@ -30,7 +30,7 @@ index 1870cc46..6378f77d 100644
      proxy:
        listen:
 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 c4915c79..97dd268f 100644
+index f458281c..e17a5f16 100644
 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml
 +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml
 @@ -72,7 +72,7 @@ parameters: