diff --git a/releasenotes/notes/remove-lvm-config-from-openstack-hosts-efb7d0b3a22d49df.yaml b/releasenotes/notes/remove-lvm-config-from-openstack-hosts-efb7d0b3a22d49df.yaml new file mode 100644 index 00000000..473abe0a --- /dev/null +++ b/releasenotes/notes/remove-lvm-config-from-openstack-hosts-efb7d0b3a22d49df.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + The LVM configuration tasks and ``lvm.conf`` template have been removed + from the ``openstack_hosts`` role since they are no longer needed. All of + the LVM configuration is properly handled in the ``os_cinder`` role. diff --git a/tasks/main.yml b/tasks/main.yml index c34592b9..505e3b45 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -48,11 +48,6 @@ - openstack_hosts-install - openstack_hosts-config -- include: openstack_lvm_config.yml - tags: - - openstack_hosts-install - - openstack_hosts-config - - include: openstack_kernel_modules.yml tags: - openstack_hosts-config diff --git a/tasks/openstack_lvm_config.yml b/tasks/openstack_lvm_config.yml deleted file mode 100644 index 60de1adf..00000000 --- a/tasks/openstack_lvm_config.yml +++ /dev/null @@ -1,36 +0,0 @@ ---- -# Copyright 2014, Rackspace US, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -- name: Discover lvm devices - shell: | - /sbin/pvdisplay | awk '/PV\ Name/ {print $3}' | sed 's/\/dev\///g' - register: lvm_devices - changed_when: lvm_devices.rc != 0 - failed_when: false - -- name: Ensure "/etc/lvm" directory - file: - state: "directory" - path: "/etc/lvm" - when: lvm_devices.rc == 0 - -- name: Drop lvm Config - template: - src: "lvm.conf.j2" - dest: "/etc/lvm/lvm.conf" - owner: "root" - group: "root" - backup: "yes" - when: lvm_devices.rc == 0 diff --git a/templates/lvm.conf.j2 b/templates/lvm.conf.j2 deleted file mode 100644 index 2bf63339..00000000 --- a/templates/lvm.conf.j2 +++ /dev/null @@ -1,121 +0,0 @@ -# {{ ansible_managed }} - -{% set used_lvm_devices = [] %} -{% set lv_devices = lvm_devices.stdout.split('\n') %} -{% if lv_devices|length > 0 %} - {% for net in lv_devices %} - {% if net != '' %} - {% set lv_device = '"a/' + net + '/"' %} - {% if used_lvm_devices.append(lv_device) %}{% endif %} - {% endif %} - {% endfor %} -{% endif %} - -# Ansible Discovered LVM Devices {{ lv_devices }} - -{% if used_lvm_devices|length <= 0 %} - {% if used_lvm_devices.append('"a/.*/"') %}{% endif %} -{% else %} - {% if used_lvm_devices.append('"r/.*/"') %}{% endif %} -{% endif %} - -{% set use_udev = 1 %} - -devices { - dir = "/dev" - scan = [ "/dev" ] - obtain_device_list_from_udev = {{ use_udev }} - preferred_names = [ ] - filter = [ {{ used_lvm_devices|join(', ') }} ] - cache_dir = "/run/lvm" - cache_file_prefix = "" - write_cache_state = 1 - sysfs_scan = 1 - multipath_component_detection = 1 - md_component_detection = 1 - md_chunk_alignment = 1 - data_alignment_detection = 1 - data_alignment = 0 - data_alignment_offset_detection = 1 - ignore_suspended_devices = 0 - disable_after_error_count = 0 - require_restorefile_with_uuid = 1 - pv_min_size = 2048 - issue_discards = 1 -} -allocation { - maximise_cling = 1 - mirror_logs_require_separate_pvs = 0 - thin_pool_metadata_require_separate_pvs = 0 -} -log { - verbose = 0 - silent = 0 - syslog = 1 - overwrite = 0 - level = 0 - indent = 1 - command_names = 0 - prefix = " " -} -backup { - backup = 1 - backup_dir = "/etc/lvm/backup" - archive = 1 - archive_dir = "/etc/lvm/archive" - retain_min = 10 - retain_days = 30 -} -shell { - history_size = 100 -} -global { - umask = 077 - test = 0 - units = "h" - si_unit_consistency = 1 - activation = 1 - proc = "/proc" - locking_type = 1 - wait_for_locks = 1 - fallback_to_clustered_locking = 1 - fallback_to_local_locking = 1 - locking_dir = "/run/lock/lvm" - prioritise_write_locks = 1 - abort_on_internal_errors = 0 - detect_internal_vg_cache_corruption = 0 - metadata_read_only = 0 - mirror_segtype_default = "mirror" - use_lvmetad = 0 - thin_check_executable = "/usr/sbin/thin_check" - thin_check_options = [ "-q" ] -} -activation { - checks = 0 - udev_sync = {{ use_udev }} - udev_rules = {{ use_udev }} - verify_udev_operations = 0 - retry_deactivation = 1 - missing_stripe_filler = "error" - use_linear_target = 1 - reserved_stack = 64 - reserved_memory = 8192 - process_priority = -18 - mirror_region_size = 512 - readahead = "auto" - raid_fault_policy = "warn" - mirror_log_fault_policy = "allocate" - mirror_image_fault_policy = "remove" - snapshot_autoextend_threshold = 100 - snapshot_autoextend_percent = 20 - thin_pool_autoextend_threshold = 100 - thin_pool_autoextend_percent = 20 - use_mlockall = 0 - monitoring = 0 - polling_interval = 15 -} -dmeventd { - mirror_library = "libdevmapper-event-lvm2mirror.so" - snapshot_library = "libdevmapper-event-lvm2snapshot.so" - thin_library = "libdevmapper-event-lvm2thin.so" -}