u/fuel: Bump & rebase for keyserver proxy rebase

[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 0876b6f..ca2b09a 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,7 +17,7 @@ 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 ebec944d..d4906c4e 100644
+index cdebe3fb..ba118ec6 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:
@@ -26,9 +26,9 @@ index ebec944d..d4906c4e 100644
        openrc_extra:
 -        volume_device_name: vdc
 +        volume_device_name: sdc
-   bind:
-     server:
-       control:
+   haproxy:
+     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
 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml