diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-12-20 15:32:48 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-12-21 17:21:16 +0400 |
| commit | e821b9398a5a998bec0143d56efb93018b8bcd8c (patch) | |
| tree | 8434b89ce9044fab4ef580a8bdbd4d96a6ca075f /mcp/patches/salt-formula-cinder | |
| parent | a31343155a621469f6e803b23dc6cc8bbb545dfa (diff) | |
Pull out rocky patches
This commit should be reverted once original formulas
get required support of rocky version.
Change-Id: Ia3458381bced0cae8dbfacc9781c90933ad5c822
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/patches/salt-formula-cinder')
| -rw-r--r-- | mcp/patches/salt-formula-cinder/0001-Support-rocky-version.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/mcp/patches/salt-formula-cinder/0001-Support-rocky-version.patch b/mcp/patches/salt-formula-cinder/0001-Support-rocky-version.patch new file mode 100644 index 000000000..abbad47d8 --- /dev/null +++ b/mcp/patches/salt-formula-cinder/0001-Support-rocky-version.patch @@ -0,0 +1,50 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2018 Mirantis Inc., Enea AB and others. +: +: All rights reserved. This program and the accompanying materials +: are made available under the terms of the Apache License, Version 2.0 +: which accompanies this distribution, and is available at +: http://www.apache.org/licenses/LICENSE-2.0 +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +From: Michael Polenchuk <mpolenchuk@mirantis.com> +Date: Thu, 29 Nov 2018 13:53:14 +0400 +Subject: [PATCH] Support rocky version + +Change-Id: I00450e0cdced03ea08ce22ac611b6baafc1c782e +Related-Prod: PROD-23724 + +diff --git a/cinder/controller.sls b/cinder/controller.sls +index f103550..33e062f 100644 +--- a/cinder/controller.sls ++++ b/cinder/controller.sls +@@ -58,7 +58,7 @@ cinder_controller_packages: + {%- set cinder_log_services = controller.services %} + {%- endif %} + +-{%- if controller.version not in ('ocata','pike','queens') %} ++{%- if controller.version not in ('ocata', 'pike', 'queens', 'rocky') %} + {%- do cinder_log_services.append('cinder-api') %} + {%- endif %} + +@@ -307,7 +307,7 @@ cinder_controller_services: + {#- Therefore if api_version is not defined and OpenStack version is mitaka or newton use v2.0. #} + {%- if 'api_version' in identity %} + {%- set keystone_api_version = identity.get('api_version') %} +-{%- else %} ++{%- else %} + {%- if 'version' in controller and controller.version in ['mitaka', 'newton'] %} + {%- set keystone_api_version = 'v2.0' %} + {%- else %} +diff --git a/cinder/map.jinja b/cinder/map.jinja +index 18050cf..01a967d 100644 +--- a/cinder/map.jinja ++++ b/cinder/map.jinja +@@ -77,7 +77,7 @@ + 'BaseDefaults': default_params, + 'Debian': { + 'pkgs': ['cinder-volume', 'lvm2', 'sysfsutils', 'sg3-utils', 'python-cinder','python-mysqldb','p7zip', 'gettext-base', 'python-memcache', 'python-pycadf'], +- 'openiscsi_pkgs': ['open-iscsi', 'tgt'], ++ 'openiscsi_pkgs': ['open-iscsi', 'tgt', 'thin-provisioning-tools'], + 'iscsitarget_pkgs': ['iscsitarget', 'iscsitarget-dkms'], + 'services': ['cinder-volume'], + 'iscsitarget_services': ['iscsitarget'], |