From 96016b756beec156a5a6f2a2e4b57ce1a8147041 Mon Sep 17 00:00:00 2001
From: Waldemar Znoinski <waldemar.znoinski@intel.com>
Date: Tue, 4 Oct 2016 15:36:53 +0000
Subject: [PATCH] set basic kolla structures for iscsid
* enable iscsid when ironic is enabled
* update sample inventory files with above
* add logrotate conf template for iscsid
* add 'common' role dependency for iscsi role
Change-Id: I3054b9139a43542febf26c3ce9a71b65f2fcdd84
Closes-bug: #1632850
---
ansible/group_vars/all.yml | 2 +-
ansible/inventory/all-in-one | 1 +
ansible/inventory/multinode | 1 +
ansible/roles/common/templates/cron-logrotate-iscsid.conf.j2 | 3 +++
ansible/roles/common/templates/cron.json.j2 | 1 +
ansible/roles/iscsi/meta/main.yml | 3 +++
6 files changed, 10 insertions(+), 1 deletion(-)
create mode 100644 ansible/roles/common/templates/cron-logrotate-iscsid.conf.j2
create mode 100644 ansible/roles/iscsi/meta/main.yml
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 71f86f5d9e..49145e8c91 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -259,7 +259,7 @@ enable_heat: "yes"
enable_horizon: "yes"
enable_influxdb: "no"
enable_ironic: "no"
-enable_iscsid: "{{ enable_cinder_backend_iscsi | bool or enable_cinder_backend_lvm | bool }}"
+enable_iscsid: "{{ enable_cinder_backend_iscsi | bool or enable_cinder_backend_lvm | bool or enable_ironic | bool }}"
enable_kuryr: "no"
enable_magnum: "no"
enable_manila: "no"
diff --git a/ansible/inventory/all-in-one b/ansible/inventory/all-in-one
index f402925a6c..8d6a009ee1 100644
--- a/ansible/inventory/all-in-one
+++ b/ansible/inventory/all-in-one
@@ -221,6 +221,7 @@ cloudkitty
[iscsid:children]
compute
storage
+ironic-conductor
[tgtd:children]
storage
diff --git a/ansible/inventory/multinode b/ansible/inventory/multinode
index 594906ca0d..95d0edc948 100644
--- a/ansible/inventory/multinode
+++ b/ansible/inventory/multinode
@@ -239,6 +239,7 @@ cloudkitty
[iscsid:children]
compute
storage
+ironic-conductor
[tgtd:children]
storage
diff --git a/ansible/roles/common/templates/cron-logrotate-iscsid.conf.j2 b/ansible/roles/common/templates/cron-logrotate-iscsid.conf.j2
new file mode 100644
index 0000000000..47fd93d1a0
--- /dev/null
+++ b/ansible/roles/common/templates/cron-logrotate-iscsid.conf.j2
@@ -0,0 +1,3 @@
+"/var/log/kolla/iscsi/iscsi.log"
+{
+}
diff --git a/ansible/roles/common/templates/cron.json.j2 b/ansible/roles/common/templates/cron.json.j2
index 85d0a1a4ff..b377709162 100644
--- a/ansible/roles/common/templates/cron.json.j2
+++ b/ansible/roles/common/templates/cron.json.j2
@@ -9,6 +9,7 @@
( 'gnocchi', enable_gnocchi ),
( 'haproxy', enable_haproxy ),
( 'heat', enable_heat ),
+ ( 'iscsid', enable_iscsid ),
( 'keepalived', enable_haproxy ),
( 'keystone', enable_keystone ),
( 'magnum', enable_magnum ),
diff --git a/ansible/roles/iscsi/meta/main.yml b/ansible/roles/iscsi/meta/main.yml
new file mode 100644
index 0000000000..6b4fff8fef
--- /dev/null
+++ b/ansible/roles/iscsi/meta/main.yml
@@ -0,0 +1,3 @@
+---
+dependencies:
+ - { role: common }