diff options
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/ceph/templates/ceph-mon.json.j2 | 8 | ||||
| -rw-r--r-- | ansible/roles/ceph/templates/ceph-rgw.json.j2 | 6 | ||||
| -rw-r--r-- | ansible/roles/cinder/templates/cinder-backup.json.j2 | 4 | ||||
| -rw-r--r-- | ansible/roles/cinder/templates/cinder-volume.json.j2 | 4 | ||||
| -rw-r--r-- | ansible/roles/common/templates/heka.json.j2 | 4 | ||||
| -rw-r--r-- | ansible/roles/haproxy/templates/haproxy.json.j2 | 2 |
6 files changed, 13 insertions, 15 deletions
diff --git a/ansible/roles/ceph/templates/ceph-mon.json.j2 b/ansible/roles/ceph/templates/ceph-mon.json.j2 index 412e778cd..d3a32b399 100644 --- a/ansible/roles/ceph/templates/ceph-mon.json.j2 +++ b/ansible/roles/ceph/templates/ceph-mon.json.j2 @@ -12,28 +12,28 @@ "dest": "/etc/ceph/ceph.client.admin.keyring", "owner": "ceph", "perm": "0600", - "optional": "True" + "optional": true }, { "source": "{{ container_config_directory }}/ceph.client.mon.keyring", "dest": "/etc/ceph/ceph.client.mon.keyring", "owner": "ceph", "perm": "0600", - "optional": "True" + "optional": true }, { "source": "{{ container_config_directory }}/ceph.client.radosgw.keyring", "dest": "/etc/ceph/ceph.client.radosgw.keyring", "owner": "ceph", "perm": "0600", - "optional": "True" + "optional": true }, { "source": "{{ container_config_directory }}/ceph.monmap", "dest": "/etc/ceph/ceph.monmap", "owner": "ceph", "perm": "0600", - "optional": "True" + "optional": true } ] } diff --git a/ansible/roles/ceph/templates/ceph-rgw.json.j2 b/ansible/roles/ceph/templates/ceph-rgw.json.j2 index 5a0b043f4..7cb0ccdd4 100644 --- a/ansible/roles/ceph/templates/ceph-rgw.json.j2 +++ b/ansible/roles/ceph/templates/ceph-rgw.json.j2 @@ -11,15 +11,13 @@ "source": "{{ container_config_directory }}/ceph.client.admin.keyring", "dest": "/etc/ceph/ceph.client.admin.keyring", "owner": "ceph", - "perm": "0600", - "optional": "True" + "perm": "0600" }, { "source": "{{ container_config_directory }}/ceph.client.radosgw.keyring", "dest": "/etc/ceph/ceph.client.radosgw.keyring", "owner": "ceph", - "perm": "0600", - "optional": "True" + "perm": "0600" } ] } diff --git a/ansible/roles/cinder/templates/cinder-backup.json.j2 b/ansible/roles/cinder/templates/cinder-backup.json.j2 index 2210fbb1c..3e6c27b6e 100644 --- a/ansible/roles/cinder/templates/cinder-backup.json.j2 +++ b/ansible/roles/cinder/templates/cinder-backup.json.j2 @@ -12,14 +12,14 @@ "dest": "/etc/ceph/ceph.client.cinder-backup.keyring", "owner": "cinder", "perm": "0600", - "optional": "true" + "optional": {{ (not enable_ceph | bool) | string | lower }} }, { "source": "{{ container_config_directory }}/ceph.conf", "dest": "/etc/ceph/ceph.conf", "owner": "cinder", "perm": "0600", - "optional": "true" + "optional": {{ (not enable_ceph | bool) | string | lower }} } ] } diff --git a/ansible/roles/cinder/templates/cinder-volume.json.j2 b/ansible/roles/cinder/templates/cinder-volume.json.j2 index 531843b37..549528410 100644 --- a/ansible/roles/cinder/templates/cinder-volume.json.j2 +++ b/ansible/roles/cinder/templates/cinder-volume.json.j2 @@ -12,14 +12,14 @@ "dest": "/etc/ceph/ceph.client.cinder.keyring", "owner": "cinder", "perm": "0600", - "optional": "true" + "optional": {{ (not enable_ceph | bool) | string | lower }} }, { "source": "{{ container_config_directory }}/ceph.conf", "dest": "/etc/ceph/ceph.conf", "owner": "cinder", "perm": "0600", - "optional": "true" + "optional": {{ (not enable_ceph | bool) | string | lower }} } ] } diff --git a/ansible/roles/common/templates/heka.json.j2 b/ansible/roles/common/templates/heka.json.j2 index 857e5185b..1087c60d0 100644 --- a/ansible/roles/common/templates/heka.json.j2 +++ b/ansible/roles/common/templates/heka.json.j2 @@ -7,7 +7,7 @@ "dest": "/etc/heka/heka-elasticsearch.toml", "owner": "heka", "perm": "0600", - "optional": "True" + "optional": {{ (not enable_central_logging | bool) | string | lower }} }, { "source": "{{ container_config_directory }}/heka-global.toml", @@ -51,7 +51,7 @@ "dest": "/etc/heka/heka-{{ swift_service }}.toml", "owner": "heka", "perm": "0600", - "optional": "True" + "optional": {{ (not enable_swift | bool) | string | lower }} }{% if not loop.last %},{% endif %} {% endfor %} diff --git a/ansible/roles/haproxy/templates/haproxy.json.j2 b/ansible/roles/haproxy/templates/haproxy.json.j2 index 9672e239b..d838dad83 100644 --- a/ansible/roles/haproxy/templates/haproxy.json.j2 +++ b/ansible/roles/haproxy/templates/haproxy.json.j2 @@ -12,7 +12,7 @@ "dest": "/etc/haproxy/haproxy.pem", "owner": "root", "perm": "0600", - "optional": "true" + "optional": {{ (not kolla_enable_tls_external | bool) | string | lower }} } ] } |