summaryrefslogtreecommitdiffstats
path: root/patches/fuel-library/0011-ceph-Fix-obsolete-XFS-mount-param-delaylog.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-05-13 19:37:20 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-05-16 12:01:02 +0000
commit2741c6e75c660727177b9d32d5cf29c60b40eb25 (patch)
treeaa0c68d520701d58380fd6fa7989576ba0406200 /patches/fuel-library/0011-ceph-Fix-obsolete-XFS-mount-param-delaylog.patch
parent85c96cb879081b3b13a6d53c50866637d09f9f42 (diff)
Rebase: p/fuel-library: Update after 96da5b4a.
Refresh patches after: "Move openstack specific tasks to their own folder structure" NOTE: The qemu-kvm change patch (0003-Make-qemu-kvm-architecture-aware.patch) only affects RedHat systems, so it is optional, at least for the current stage. [1] https://github.com/openstack/fuel-library/commit/ 96da5b4a1eb82a76fb416d93f5249dc32e2499f2 Change-Id: Ibd1fd3f7e45d7947c90336bbe7e2ace101b5802b
Diffstat (limited to 'patches/fuel-library/0011-ceph-Fix-obsolete-XFS-mount-param-delaylog.patch')
-rw-r--r--patches/fuel-library/0011-ceph-Fix-obsolete-XFS-mount-param-delaylog.patch56
1 files changed, 27 insertions, 29 deletions
diff --git a/patches/fuel-library/0011-ceph-Fix-obsolete-XFS-mount-param-delaylog.patch b/patches/fuel-library/0011-ceph-Fix-obsolete-XFS-mount-param-delaylog.patch
index 0d13efeb..0ddad114 100644
--- a/patches/fuel-library/0011-ceph-Fix-obsolete-XFS-mount-param-delaylog.patch
+++ b/patches/fuel-library/0011-ceph-Fix-obsolete-XFS-mount-param-delaylog.patch
@@ -11,38 +11,36 @@ older than 4.0.
[1] https://www.kernel.org/doc/Documentation/filesystems/xfs.txt
---
- deployment/puppet/osnailyfacter/modular/ceph/ceph-osd.pp | 7 +++++++
- deployment/puppet/osnailyfacter/modular/globals/globals.pp | 2 +-
+ deployment/puppet/osnailyfacter/manifests/ceph/ceph_osd.pp | 7 +++++++
+ deployment/puppet/osnailyfacter/manifests/globals/globals.pp | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
-diff --git a/deployment/puppet/osnailyfacter/modular/ceph/ceph-osd.pp b/deployment/puppet/osnailyfacter/modular/ceph/ceph-osd.pp
+diff --git a/deployment/puppet/osnailyfacter/manifests/ceph/ceph_osd.pp b/deployment/puppet/osnailyfacter/manifests/ceph/ceph_osd.pp
index f7da80e..22aab33 100644
---- a/deployment/puppet/osnailyfacter/modular/ceph/ceph-osd.pp
-+++ b/deployment/puppet/osnailyfacter/modular/ceph/ceph-osd.pp
-@@ -50,6 +50,13 @@ class {'ceph':
- }
+--- a/deployment/puppet/osnailyfacter/manifests/ceph/ceph_osd.pp
++++ b/deployment/puppet/osnailyfacter/manifests/ceph/ceph_osd.pp
+@@ -50,4 +50,11 @@ class {'ceph':
+ }
- if $ceph_tuning_settings != {} {
-+ if versioncmp($::kernelmajversion, '4.0') < 0 {
-+ # FIXME(armband): XFS mount opt delaylog is deprecated in kernels >=4.0.
-+ $ceph_tuning_settings['osd_mount_options_xfs'] = join([
-+ $ceph_tuning_settings['osd_mount_options_xfs'],
-+ 'delaylog'
-+ ], ',')
-+ }
- ceph_conf {
- 'global/debug_default' : value => $debug;
- 'global/max_open_files' : value => $ceph_tuning_settings['max_open_files'];
-diff --git a/deployment/puppet/osnailyfacter/modular/globals/globals.pp b/deployment/puppet/osnailyfacter/modular/globals/globals.pp
+ if $ceph_tuning_settings_hash != {} {
++ if versioncmp($::kernelmajversion, '4.0') < 0 {
++ # FIXME(armband): XFS mount opt delaylog is deprecated in kernels >=4.0.
++ $ceph_tuning_settings_hash['osd_mount_options_xfs'] = join([
++ $ceph_tuning_settings_hash['osd_mount_options_xfs'],
++ 'delaylog'
++ ], ',')
++ }
+ ceph_conf {
+diff --git a/deployment/puppet/osnailyfacter/manifests/globals/globals.pp b/deployment/puppet/osnailyfacter/modular/globals/globals.pp
index 268a5b1..69aed7b 100644
---- a/deployment/puppet/osnailyfacter/modular/globals/globals.pp
-+++ b/deployment/puppet/osnailyfacter/modular/globals/globals.pp
+--- a/deployment/puppet/osnailyfacter/manifests/globals/globals.pp
++++ b/deployment/puppet/osnailyfacter/manifests/globals/globals.pp
@@ -123,7 +123,7 @@ if ($storage_hash['volumes_ceph'] or $storage_hash['images_ceph'] or $storage_ha
- $ceph_tuning_settings = {
- 'max_open_files' => pick($storage_tuning_settings['max_open_files'], '131072'),
- 'osd_mkfs_type' => pick($storage_tuning_settings['osd_mkfs_type'], 'xfs'),
-- 'osd_mount_options_xfs' => pick($storage_tuning_settings['osd_mount_options_xfs'], 'rw,relatime,inode64,logbsize=256k,delaylog,allocsize=4M'),
-+ 'osd_mount_options_xfs' => pick($storage_tuning_settings['osd_mount_options_xfs'], 'rw,relatime,inode64,logbsize=256k,allocsize=4M'),
- 'osd_op_threads' => pick($storage_tuning_settings['osd_op_threads'], '20'),
- 'filestore_queue_max_ops' => pick($storage_tuning_settings['filestore_queue_max_ops'], '500'),
- 'filestore_queue_committing_max_ops' => pick($storage_tuning_settings['filestore_queue_committing_max_ops'], '5000'),
+ $ceph_tuning_settings = {
+ 'max_open_files' => pick($storage_tuning_settings['max_open_files'], '131072'),
+ 'osd_mkfs_type' => pick($storage_tuning_settings['osd_mkfs_type'], 'xfs'),
+- 'osd_mount_options_xfs' => pick($storage_tuning_settings['osd_mount_options_xfs'], 'rw,relatime,inode64,logbsize=256k,delaylog,allocsize=4M'),
++ 'osd_mount_options_xfs' => pick($storage_tuning_settings['osd_mount_options_xfs'], 'rw,relatime,inode64,logbsize=256k,allocsize=4M'),
+ 'osd_op_threads' => pick($storage_tuning_settings['osd_op_threads'], '20'),
+ 'filestore_queue_max_ops' => pick($storage_tuning_settings['filestore_queue_max_ops'], '500'),
+ 'filestore_queue_committing_max_ops' => pick($storage_tuning_settings['filestore_queue_committing_max_ops'], '5000'),