cinder&glance: allow users to set nodeSelector

Some scenarios may require specific restrictions for the place where
the nodes are deployed.
This change adds new variable which allows users to set nodeSelector
rules for cinder-backup, cinder-volume (per backend) and glance.

Author: tosky

tests/roles/cinder_adoption/defaults/main.yaml

@@ -136,3 +136,8 @@ cinder_volume_pure_vars:
 # Vars for cinder-backup
 cinder_backup_nfs_backup_mount_point_base: "/var/lib/cinder/backup"
 cinder_retry_delay: 5
+
+# Dictionary of nodeSelector key/values as keys of cinder-volume backend names
+cinder_volumes_nodeselector: {}
+# Dictionary of nodeSelector key/values
+cinder_backup_nodeselector: {}

tests/roles/cinder_adoption/tasks/backup_backend.yaml

@@ -18,3 +18,7 @@
     cinder_backup_backend == 'nfs' or
     cinder_backup_backend == 'ontap-nfs'
   ansible.builtin.include_tasks: cinder_backup_nfs.yaml
+
+- name: Apply additional cinder-backup settings
+  ansible.builtin.include_tasks: extra_cinder_backup_settings.yaml
+  when: cinder_backup_nodeselector | length > 0

tests/roles/cinder_adoption/tasks/extra_cinder_backup_settings.yaml

@@ -0,0 +1,12 @@
+---
+- name: Generate the nodeSelector patch for cinder-backup
+  ansible.builtin.template:
+    src: cinder_backup_extra_nodeselector.yaml.j2
+    dest: /tmp/cinder_backup_extra_nodeselector.yaml
+    mode: "0600"
+
+- name: Apply the nodeSelector patch for cinder-backup
+  ansible.builtin.shell: |
+    {{ shell_header }}
+    {{ oc_header }}
+    oc patch openstackcontrolplane openstack --type=merge --patch-file=/tmp/cinder_backup_extra_nodeselector.yaml

tests/roles/cinder_adoption/tasks/extra_cinder_volumes_settings.yaml

@@ -0,0 +1,12 @@
+---
+- name: Generate the nodeSelector patch for the Cinder volumes
+  ansible.builtin.template:
+    src: cinder_volumes_extra_nodeselector.yaml.j2
+    dest: /tmp/cinder_volumes_extra_nodeselector.yaml
+    mode: "0600"
+
+- name: Apply the nodeSelector patch for the Cinder volumes
+  ansible.builtin.shell: |
+    {{ shell_header }}
+    {{ oc_header }}
+    oc patch openstackcontrolplane openstack --type=merge --patch-file=/tmp/cinder_volumes_extra_nodeselector.yaml

tests/roles/cinder_adoption/tasks/volume_backend.yaml

@@ -15,3 +15,7 @@
   when: >
     cinder_volume_backend == 'pure-fc'
   ansible.builtin.include_tasks: cinder_volume_pure.yaml
+
+- name: Apply additional settings to Cinder volumes
+  ansible.builtin.include_tasks: extra_cinder_volumes_settings.yaml
+  when: cinder_volumes_nodeselector | length > 0

tests/roles/cinder_adoption/templates/cinder_backup_extra_nodeselector.yaml.j2

@@ -0,0 +1,8 @@
+spec:
+  cinder:
+    template:
+      cinderBackup:
+        nodeSelector:
+{% for ns_key, ns_value in cinder_backup_nodeselector.items() %}
+          {{ ns_key }}: {{ ns_value }}
+{% endfor %}

tests/roles/cinder_adoption/templates/cinder_volumes_extra_nodeselector.yaml.j2

@@ -0,0 +1,11 @@
+spec:
+  cinder:
+    template:
+      cinderVolumes:
+{% for cv_name, cv_nodeselector in cinder_volumes_nodeselector.items() %}
+        {{ cv_name }}:
+          nodeSelector:
+{% for ns_key, ns_value in cv_nodeselector.items() %}
+            {{ ns_key }}: {{ ns_value }}
+{% endfor %}
+{% endfor %}

tests/roles/glance_adoption/defaults/main.yaml

@@ -1,3 +1,6 @@
 # glance_backend can be 'nfs', 'ceph', 'swift', 'cinder'
 glance_backend: swift
 glance_retry_delay: 5
+
+# Dictionary of nodeSelector key/values
+glance_nodeselector: {}

tests/roles/glance_adoption/tasks/extra_glance_settings.yaml

@@ -0,0 +1,12 @@
+---
+- name: Generate the nodeSelector patch for Glance
+  ansible.builtin.template:
+    src: glance_extra_nodeselector.yaml.j2
+    dest: /tmp/glance_extra_nodeselector.yaml
+    mode: "0600"
+
+- name: Apply the nodeSelector patch for Glance
+  ansible.builtin.shell: |
+    {{ shell_header }}
+    {{ oc_header }}
+    oc patch openstackcontrolplane openstack --type=merge --patch-file=/tmp/glance_extra_nodeselector.yaml

tests/roles/glance_adoption/tasks/main.yaml

@@ -14,5 +14,9 @@
   when: glance_backend == 'cinder'
   ansible.builtin.include_tasks: glance_cinder.yaml
 
+- name: Apply additional Glance settings
+  ansible.builtin.include_tasks: extra_glance_settings.yaml
+  when: glance_nodeselector | length > 0
+
 - name: Check the adopted GlanceAPI
   ansible.builtin.include_tasks: check_glance.yaml