summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch
diff options
context:
space:
mode:
authorDelia Popescu <delia.popescu@enea.com>2018-06-22 13:37:17 +0300
committerDelia Popescu <delia.popescu@enea.com>2018-06-22 13:40:41 +0300
commit00c37dceccacd32c3715c8aad2e6c4690d0d7dd9 (patch)
treea0d6f3b43bdf95ee46834980959c12963a5869e7 /patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch
parente5b73f1666aea0f2b4dae7f5e6bb78979073a3e2 (diff)
[patch] Rebase latest changes
Change-Id: I2ada30db2d076dab8895c77075255c1bac062fe2 Signed-off-by: Delia Popescu <delia.popescu@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch')
-rw-r--r--patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch28
1 files changed, 16 insertions, 12 deletions
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 65d58a78..1b2da2d9 100644
--- 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
@@ -12,15 +12,15 @@ Subject: [PATCH] Set volume name in source file to sdX
Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
---
- .../classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 | 2 +-
- .../classes/cluster/mcp-pike-common-noha/openstack_control.yml | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ .../classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 | 2 +-
+ .../classes/cluster/mcp-pike-common-noha/openstack_control.yml | 6 ++++++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2
-index 599c48e8..018253bb 100644
+index 6f7b33e3..dfc212e2 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2
-@@ -130,7 +130,7 @@ parameters:
+@@ -139,7 +139,7 @@ parameters:
server:
cacert: /etc/ssl/certs/mcp_os_cacert
openrc_extra:
@@ -30,15 +30,19 @@ index 599c48e8..018253bb 100644
server:
control:
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml
-index 29b2d627..3a994b8d 100644
+index 1c94738a..74667e21 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml
-@@ -71,7 +71,7 @@ parameters:
- server:
+@@ -58,6 +58,12 @@ parameters:
admin_email: ${_param:admin_email}
openrc_extra:
-- volume_device_name: vdc
+ volume_device_name: vdc
+ volume_device_name: sdc
- pkgs:
- - keystone
- - python-psycopg2
++ pkgs:
++ - keystone
++ - python-psycopg2
++ - python-mysqldb
++ - python-openstackclient
+ glance:
+ server:
+ storage: