diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-09-21 01:32:59 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-09-22 17:42:59 +0000 |
| commit | daf133b7fcca4ae36da6bbd29689e3d0932755c6 (patch) | |
| tree | f391acc39b66732b669940922a089dae83ecbe84 | |
| parent | a880b5c0fe55397b73f0fcf8f8c87d523327099d (diff) | |
p/fuel: Refresh patch context
Change-Id: I28a9ea4f44d8a9e4f659f28f116bac9e0602fdd2
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 800e967610c003b535c6dad8289458207632d757)
| -rw-r--r-- | patches/opnfv-fuel/0001-Set-volume-name-in-source-file-to-sdX.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/patches/opnfv-fuel/0001-Set-volume-name-in-source-file-to-sdX.patch b/patches/opnfv-fuel/0001-Set-volume-name-in-source-file-to-sdX.patch index 62f1ffff..06dc3645 100644 --- a/patches/opnfv-fuel/0001-Set-volume-name-in-source-file-to-sdX.patch +++ b/patches/opnfv-fuel/0001-Set-volume-name-in-source-file-to-sdX.patch @@ -13,14 +13,14 @@ Subject: [PATCH] Set volume name in source file to sdX Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com> --- .../classes/cluster/mcp-common-ha/openstack_control.yml.j2 | 2 +- - .../classes/cluster/mcp-common-noha/openstack_control.yml | 2 +- + .../classes/cluster/mcp-common-noha/openstack_control.yml.j2 | 2 +- 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 a7e8fcde..81a8a2af 100644 +index 413b3737..c1414a95 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 -@@ -91,7 +91,7 @@ parameters: +@@ -90,7 +90,7 @@ parameters: <<: *db_conn_recycle_time cacert: /etc/ssl/certs/mcp_os_cacert openrc_extra: @@ -29,11 +29,11 @@ index a7e8fcde..81a8a2af 100644 glance: 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 dd4b9c4f..d235ef4a 100644 ---- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml -+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml -@@ -80,7 +80,7 @@ parameters: +diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 +index d1caafe4..2f7e39d8 100644 +--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 ++++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 +@@ -85,7 +85,7 @@ parameters: server: admin_email: ${_param:admin_email} openrc_extra: |