diff options
| -rw-r--r-- | ansible/roles/nova-cell/tasks/config.yml | 20 | ||||
| -rw-r--r-- | ansible/roles/nova-cell/templates/multipath.conf.j2 | 8 | ||||
| -rw-r--r-- | ansible/roles/nova-cell/templates/nova-compute.json.j2 | 6 |
3 files changed, 34 insertions, 0 deletions
diff --git a/ansible/roles/nova-cell/tasks/config.yml b/ansible/roles/nova-cell/tasks/config.yml index 87104f89e..b6bd7e5d0 100644 --- a/ansible/roles/nova-cell/tasks/config.yml +++ b/ansible/roles/nova-cell/tasks/config.yml @@ -212,3 +212,23 @@ with_items: - nova-compute - nova-compute-ironic + +- name: Copying over multipath.conf + become: true + vars: + service: "{{ nova_cell_services['nova-compute'] }}" + ansible.builtin.template: + src: "{{ item }}" + dest: "{{ node_config_directory }}/nova-compute/multipath.conf" + mode: "0660" + with_first_found: + - files: + - "{{ node_custom_config }}/nova/{{ inventory_hostname }}/multipath.conf" + - "{{ node_custom_config }}/multipath/{{ inventory_hostname }}/multipath.conf" + - "{{ node_custom_config }}/nova/multipath.conf" + - "{{ node_custom_config }}/multipath.conf" + - "multipath.conf.j2" + skip: true + when: + - service | service_enabled_and_mapped_to_host + - enable_multipathd | bool diff --git a/ansible/roles/nova-cell/templates/multipath.conf.j2 b/ansible/roles/nova-cell/templates/multipath.conf.j2 new file mode 100644 index 000000000..478eef023 --- /dev/null +++ b/ansible/roles/nova-cell/templates/multipath.conf.j2 @@ -0,0 +1,8 @@ +defaults { + user_friendly_names no + find_multipaths yes + skip_kpartx yes +} + +blacklist { +} diff --git a/ansible/roles/nova-cell/templates/nova-compute.json.j2 b/ansible/roles/nova-cell/templates/nova-compute.json.j2 index 655ee0379..97bd5235e 100644 --- a/ansible/roles/nova-cell/templates/nova-compute.json.j2 +++ b/ansible/roles/nova-cell/templates/nova-compute.json.j2 @@ -79,6 +79,12 @@ "dest": "/var/lib/kolla/share/ca-certificates", "owner": "root", "perm": "0600" + }{% endif %}{% if enable_multipathd | bool %}, + { + "source": "{{ container_config_directory }}/multipath.conf", + "dest": "/etc/multipath.conf", + "owner": "root", + "perm": "0644" }{% endif %} ], "permissions": [ |