Merge pull request #660 from akrzos/sno_nvme_for_etcd

Enable Etcd on NVMe for SNOs and converge controlplane and sno igniti…

Author: openshift-merge-bot[bot]

ansible/roles/configure-local-storage/defaults/main.yml

@@ -1,18 +1,17 @@
 ---
 # configure-local-storage default vars
 
-sno_localstorage_configuration: false
-sno_localstorage_device: /dev/nvme0n1
-sno_localstorage_lv_count: 10
-sno_localstorage_lv_size: 100G
-
+# controlplane_* configures local storage on SNO, 3-Node Compact MNO, and
+# Control-plane nodes on a "standard" multi-node deployment with workers
 controlplane_etcd_on_nvme: false
 controlplane_nvme_device: /dev/nvme0n1
 controlplane_localstorage_configuration: false
 controlplane_localstorage_device: /dev/sdb
 controlplane_localstorage_lv_count: 10
 controlplane_localstorage_lv_size: 100G
 
+# worker_* configures local storage on worker nodes on a "standard"
+# multi-node deployment with workers
 worker_localstorage_configuration: false
 worker_localstorage_device: /dev/nvme0n1
 worker_localstorage_lv_count: 10

ansible/roles/configure-local-storage/tasks/main.yml

@@ -10,37 +10,27 @@
     return_content: true
   register: get_hosts
 
-- name: Multi Node storage configuration
-  block:
-  - name: Apply controlplane host ignition config overrides
-    uri:
-      url: "http://{{ assisted_installer_host }}:{{ assisted_installer_port }}/api/assisted-install/v2/infra-envs/{{ ai_infraenv_id }}/hosts/{{ item.id }}/ignition"
-      method: PATCH
-      body_format: json
-      status_code: [201]
-      return_content: true
-      body: { "config": "{{ lookup('template', 'controlplane.ign.j2') | to_json }}" }
-    with_items: "{{ get_hosts.json|selectattr('role', 'eq', 'master') | list }}"
-    when: (controlplane_etcd_on_nvme or controlplane_localstorage_configuration)
-
-  - name: Apply worker host ignition config overrides
-    uri:
-      url: "http://{{ assisted_installer_host }}:{{ assisted_installer_port }}/api/assisted-install/v2/infra-envs/{{ ai_infraenv_id }}/hosts//{{ item.id }}/ignition"
-      method: PATCH
-      body_format: json
-      status_code: [201]
-      return_content: true
-      body: { "config": "{{ lookup('template', 'worker.ign.j2') | to_json }}" }
-    with_items: "{{ get_hosts.json|selectattr('role', 'eq', 'worker') | list }}"
-    when: worker_localstorage_configuration
-  when: cluster_type != "sno"
+# Applies both SNO and MNO control-plane Etcd on NVME and/or localstorage configuration
+- name: Apply controlplane host ignition config overrides
+  uri:
+    url: "http://{{ assisted_installer_host }}:{{ assisted_installer_port }}/api/assisted-install/v2/infra-envs/{{ ai_infraenv_id }}/hosts/{{ item.id }}/ignition"
+    method: PATCH
+    body_format: json
+    status_code: [201]
+    return_content: true
+    body: { "config": "{{ lookup('template', 'controlplane.ign.j2') | to_json }}" }
+  with_items: "{{ get_hosts.json|selectattr('role', 'eq', 'master') | list }}"
+  when: (controlplane_etcd_on_nvme or controlplane_localstorage_configuration)
 
-- name: Apply sno host ignition config overrides
+- name: Apply worker host ignition config overrides
   uri:
-    url: "http://{{ assisted_installer_host }}:{{ assisted_installer_port }}/api/assisted-install/v2/infra-envs/{{ ai_infraenv_id }}/hosts/{{ get_hosts.json[0].id }}/ignition"
+    url: "http://{{ assisted_installer_host }}:{{ assisted_installer_port }}/api/assisted-install/v2/infra-envs/{{ ai_infraenv_id }}/hosts//{{ item.id }}/ignition"
     method: PATCH
     body_format: json
     status_code: [201]
     return_content: true
-    body: { "config": "{{ lookup('template', 'sno.ign.j2') | to_json }}" }
-  when: cluster_type == "sno" and sno_localstorage_configuration
+    body: { "config": "{{ lookup('template', 'worker.ign.j2') | to_json }}" }
+  with_items: "{{ get_hosts.json|selectattr('role', 'eq', 'worker') | list }}"
+  when:
+  - worker_localstorage_configuration
+  - cluster_type != "sno"

ansible/roles/configure-local-storage/templates/sno-setup-lvm.sh.j2

@@ -100,7 +100,7 @@
   when: setup_openshift_gitops
 
 - name: Setup nodes localstorage
-  when: sno_localstorage_configuration
+  when: controlplane_localstorage_configuration
   block:
   - name: Install local-storage operator
     shell:

ansible/roles/configure-local-storage/templates/sno.ign.j2

@@ -10,6 +10,6 @@ spec:
     volumeMode: Filesystem
     fsType: xfs
     devicePaths:
-{% for i in range(sno_localstorage_lv_count) %}
-      - "/dev/vg_ls/lv_sno_tv{{ '%02d' % i }}"
+{% for i in range(controlplane_localstorage_lv_count) %}
+      - "/dev/vg_ls/lv_cp_tv{{ '%02d' % i }}"
 {% endfor %}