diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-13 14:06:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-13 14:06:28 +0000 |
| commit | dae88516fcc22c4fb121d8a7e2d20ddcb97afc78 (patch) | |
| tree | 00b79c6ec3d3f3a6c14983c326a2a6bf98bd6b74 /ansible | |
| parent | 2abef796d63d04b337b0ddc487b73942d6bff38f (diff) | |
| parent | 96016b756beec156a5a6f2a2e4b57ce1a8147041 (diff) | |
| download | kolla-dae88516fcc22c4fb121d8a7e2d20ddcb97afc78.tar.gz kolla-dae88516fcc22c4fb121d8a7e2d20ddcb97afc78.zip | |
Merge "set basic kolla structures for iscsid"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/group_vars/all.yml | 2 | ||||
| -rw-r--r-- | ansible/inventory/all-in-one | 1 | ||||
| -rw-r--r-- | ansible/inventory/multinode | 1 | ||||
| -rw-r--r-- | ansible/roles/common/templates/cron-logrotate-iscsid.conf.j2 | 3 | ||||
| -rw-r--r-- | ansible/roles/common/templates/cron.json.j2 | 1 | ||||
| -rw-r--r-- | ansible/roles/iscsi/meta/main.yml | 3 |
6 files changed, 10 insertions, 1 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 55feff1d5..db179b8e2 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 f402925a6..8d6a009ee 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 594906ca0..95d0edc94 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 000000000..47fd93d1a --- /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 7e1f4ab17..e90ab4f9c 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 000000000..6b4fff8fe --- /dev/null +++ b/ansible/roles/iscsi/meta/main.yml @@ -0,0 +1,3 @@ +--- +dependencies: + - { role: common } |