Merge pull request openstack-k8s-operators#634 from gibizer/pre-adoption-kernelargs

[pre-adoption-validation]Check kernel args

Author: openshift-merge-bot[bot]

roles/edpm_kernel/tasks/hugepages.yml

@@ -0,0 +1,87 @@
+---
+# Copyright 2019 Red Hat, Inc.
+# All Rights Reserved.
+#
+# 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: EDPM Hugepages configuration
+  vars:
+    _converted_hugepages: {}
+    _nonconfig_hugepages: {}
+    _hugepages_modification: false
+  when: edpm_kernel_hugepages | length
+  block:
+    - name: Rewrite edpm_kernel_hugepages to use integers as keys
+      ansible.builtin.set_fact:
+        _edpm_kernel_hugepages: "{{ _edpm_kernel_hugepages | default({}) | combine({hp.key | int: hp.value}) }}"
+      loop: "{{ edpm_kernel_hugepages | dict2items }}"
+      loop_control:
+        loop_var: hp
+
+    - name: Parsing running hugepage configuration from /proc/cmdline
+      when: >
+        "default_hugepagesz" in cmdline
+      ansible.builtin.import_tasks: hugepages_parsing.yaml
+      vars:
+        cmdline_text: "{{ cmdline }}"
+
+    - name: Validating hugepage config from /proc/cmdline against EDPM parameter
+      ansible.builtin.import_tasks: hugepages_validations.yaml
+
+    - name: Rewrite kernel args
+      when: _hugepages_modification
+      block:
+        - name: Warn about possible modifications
+          ansible.builtin.debug:
+            msg: |
+              EDPM hugepage modification differs from how the host is actually having.
+              Current default pagesize: {{ _configured_default_size | default("None configured") }}
+              EDPM default pagesize: {{ _edpm_default_hugepages }}
+              Desired default pagesize: {{ _desired_default_hugepages }}
+
+              From EDPM Hugepages configuration:
+              {% for pagesize, config in _edpm_kernel_hugepages.items() %}
+              - {{ pagesize }}
+                expected: {{ config.count }} pages
+                default: {{ config.default | default(false) }}
+                current: {{ _converted_hugepages.get(pagesize | int, 0) }}
+              {% endfor %}
+              {% if _nonconfig_hugepages | length %}
+              There's also some hugepages on the host that are not part of the EDPM configuration
+              {% for pagesize, config in _nonconfig_hugepages.items() %}
+              - {{ pagesize }}: {{ config }} pages
+              {% endfor %}
+              {% endif %}
+
+        - name: Remove hugepage settings from kernelargs
+          ansible.builtin.set_fact:
+            _kernel_args: >-
+              {{ edpm_kernel_args | regex_replace('[\s]*(default_)*hugepages[z]*=[\S]+[\s]*', ' ') }}
+              default_hugepagesz={{ _desired_default_hugepages }}
+              {% for hp, values in _edpm_kernel_hugepages.items() -%}
+              hugepagesz={{ hp }} hugepages={{ values.count }}
+              {% endfor -%}
+              {% if not edpm_kernel_hugepages_remove | bool -%}
+              {% for hp, values in _nonconfig_hugepages.items() -%}
+              hugepagesz={{ hp }} hugepages={{ values }}
+              {% endfor -%}
+              {% endif -%}
+
+        - name: Cleaning up whitespaces
+          ansible.builtin.set_fact:
+            edpm_kernel_args: >-
+              {{ _kernel_args |
+                regex_replace('[\s]+default_hugepagesz=', ' default_hugepagesz=') |
+                regex_replace('[\s]+', ' ') |
+                regex_replace('[\s]+$', '')
+              }}

roles/edpm_kernel/tasks/kernelargs.yml

@@ -47,77 +47,8 @@
           ansible.builtin.set_fact:
             _workload_protection: true
 
-- name: EDPM Hugepages configuration
-  vars:
-    _converted_hugepages: {}
-    _nonconfig_hugepages: {}
-    _hugepages_modification: false
-  when: edpm_kernel_hugepages | length
-  block:
-    - name: Rewrite edpm_kernel_hugepages to use integers as keys
-      ansible.builtin.set_fact:
-        _edpm_kernel_hugepages: "{{ _edpm_kernel_hugepages | default({}) | combine({hp.key | int: hp.value}) }}"
-      loop: "{{ edpm_kernel_hugepages | dict2items }}"
-      loop_control:
-        loop_var: hp
-
-    - name: Parsing running hugepage configuration from /proc/cmdline
-      when: >
-        "default_hugepagesz" in cmdline
-      ansible.builtin.import_tasks: hugepages_parsing.yaml
-      vars:
-        cmdline_text: "{{ cmdline }}"
-
-    - name: Validating hugepage config from /proc/cmdline against EDPM parameter
-      ansible.builtin.import_tasks: hugepages_validations.yaml
-
-    - name: Rewrite kernel args
-      when: _hugepages_modification
-      block:
-        - name: Warn about possible modifications
-          ansible.builtin.debug:
-            msg: |
-              EDPM hugepage modification differs from how the host is actually having.
-              Current default pagesize: {{ _configured_default_size | default("None configured") }}
-              EDPM default pagesize: {{ _edpm_default_hugepages }}
-              Desired default pagesize: {{ _desired_default_hugepages }}
-
-              From EDPM Hugepages configuration:
-              {% for pagesize, config in _edpm_kernel_hugepages.items() %}
-              - {{ pagesize }}
-                expected: {{ config.count }} pages
-                default: {{ config.default | default(false) }}
-                current: {{ _converted_hugepages.get(pagesize | int, 0) }}
-              {% endfor %}
-              {% if _nonconfig_hugepages | length %}
-              There's also some hugepages on the host that are not part of the EDPM configuration
-              {% for pagesize, config in _nonconfig_hugepages.items() %}
-              - {{ pagesize }}: {{ config }} pages
-              {% endfor %}
-              {% endif %}
-
-        - name: Remove hugepage settings from kernelargs
-          ansible.builtin.set_fact:
-            _kernel_args: >-
-              {{ edpm_kernel_args | regex_replace('[\s]*(default_)*hugepages[z]*=[\S]+[\s]*', ' ') }}
-              default_hugepagesz={{ _desired_default_hugepages }}
-              {% for hp, values in _edpm_kernel_hugepages.items() -%}
-              hugepagesz={{ hp }} hugepages={{ values.count }}
-              {% endfor -%}
-              {% if not edpm_kernel_hugepages_remove | bool -%}
-              {% for hp, values in _nonconfig_hugepages.items() -%}
-              hugepagesz={{ hp }} hugepages={{ values }}
-              {% endfor -%}
-              {% endif -%}
-
-        - name: Cleaning up whitespaces
-          ansible.builtin.set_fact:
-            edpm_kernel_args: >-
-              {{ _kernel_args |
-                regex_replace('[\s]+default_hugepagesz=', ' default_hugepagesz=') |
-                regex_replace('[\s]+', ' ') |
-                regex_replace('[\s]+$', '')
-              }}
+- name: Handle hugepages
+  ansible.builtin.include_tasks: hugepages.yml
 
 - name: Check if the kernelargs entry is already present in the file
   ansible.builtin.replace:

roles/edpm_pre_adoption_validation/defaults/main.yml

@@ -18,3 +18,6 @@
 # All variables intended for modification should be placed in this file.
 edpm_pre_adoption_validation_old_nova_config: /var/lib/config-data/puppet-generated/nova_libvirt/etc/nova/nova.conf
 edpm_pre_adoption_validation_old_neutron_config: /var/lib/config-data/puppet-generated/neutron/etc/neutron/neutron.conf
+
+edpm_pre_adoption_validation_hostname_enabled: true
+edpm_pre_adoption_validation_kernel_args_enabled: true

roles/edpm_pre_adoption_validation/meta/argument_specs.yml

@@ -12,3 +12,11 @@ argument_specs:
         type: str
         default: /var/lib/config-data/puppet-generated/neutron/etc/neutron/nova.conf
         description: The path of the pre-adoption version of the neutron.conf file on the node
+      edpm_pre_adoption_validation_hostname_enabled:
+        type: bool
+        default: true
+        description: Whether the hostname checks are executed.
+      edpm_pre_adoption_validation_kernel_args_enabled:
+        type: bool
+        default: true
+        description: Whether the kernel argument checks are executed.