Merge "set basic kolla structures for iscsid"

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"

ansible/inventory/all-in-one

@@ -221,6 +221,7 @@ cloudkitty
 [iscsid:children]
 compute
 storage
+ironic-conductor
 
 [tgtd:children]
 storage

ansible/inventory/multinode

@@ -239,6 +239,7 @@ cloudkitty
 [iscsid:children]
 compute
 storage
+ironic-conductor
 
 [tgtd:children]
 storage

ansible/roles/common/templates/cron-logrotate-iscsid.conf.j2

@@ -0,0 +1,3 @@
+"/var/log/kolla/iscsi/iscsi.log"
+{
+}

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 ),

ansible/roles/iscsi/meta/main.yml

@@ -0,0 +1,3 @@
+---
+dependencies:
+  - { role: common }