From 2447c161b8887e130ff2586dee2413c2850572a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= <radoslaw.piliszek@gmail.com>
Date: Tue, 17 Sep 2019 13:47:40 +0200
Subject: [PATCH] Zun: add Cinder (volume) iSCSI support

This makes iSCSI with Zun and Cinder work out-of-the-box.
(LVM included)

Change-Id: I2c4aa666ff9f952e32c450347d31ddbf2e58209e
Related-bug: #1797448
Closes-bug: #1848933
---
 ansible/roles/zun/defaults/main.yml                | 2 ++
 releasenotes/notes/zun-iscsi-7ca24c2c4eb9d5a5.yaml | 5 +++++
 2 files changed, 7 insertions(+)
 create mode 100644 releasenotes/notes/zun-iscsi-7ca24c2c4eb9d5a5.yaml

diff --git a/ansible/roles/zun/defaults/main.yml b/ansible/roles/zun/defaults/main.yml
index cc2eba603f..5acf95ee25 100644
--- a/ansible/roles/zun/defaults/main.yml
+++ b/ansible/roles/zun/defaults/main.yml
@@ -95,6 +95,8 @@ zun_compute_default_volumes:
   - "/run:/run:shared"
   - "/usr/lib/docker:/usr/lib/docker"
   - "/var/lib/docker:/var/lib/docker"
+  - "/lib/modules:/lib/modules:ro"
+  - "{% if enable_iscsid | bool %}iscsi_info:/etc/iscsi{% endif %}"
 
 zun_extra_volumes: "{{ default_extra_volumes }}"
 zun_api_extra_volumes: "{{ zun_extra_volumes }}"
diff --git a/releasenotes/notes/zun-iscsi-7ca24c2c4eb9d5a5.yaml b/releasenotes/notes/zun-iscsi-7ca24c2c4eb9d5a5.yaml
new file mode 100644
index 0000000000..9cdb6cb491
--- /dev/null
+++ b/releasenotes/notes/zun-iscsi-7ca24c2c4eb9d5a5.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Adds support for iSCSI-based (including LVM) Cinder volumes
+    to Zun deployment.