openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix 'optional' config.json values"

Browse Source
This commit is contained in:
Jenkins 2016-03-21 12:39:46 +00:00 committed by Gerrit Code Review
commit fe1f7e29ce
7 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ansible/roles/ceph/templates/ceph-mon.json.j2
View File

@ -12,28 +12,28 @@
"dest": "/etc/ceph/ceph.client.admin.keyring", "dest": "/etc/ceph/ceph.client.admin.keyring",
"owner": "ceph", "owner": "ceph",
"perm": "0600", "perm": "0600",
"optional": "True" "optional": true
}, },
{ {
"source": "{{ container_config_directory }}/ceph.client.mon.keyring", "source": "{{ container_config_directory }}/ceph.client.mon.keyring",
"dest": "/etc/ceph/ceph.client.mon.keyring", "dest": "/etc/ceph/ceph.client.mon.keyring",
"owner": "ceph", "owner": "ceph",
"perm": "0600", "perm": "0600",
"optional": "True" "optional": true
}, },
{ {
"source": "{{ container_config_directory }}/ceph.client.radosgw.keyring", "source": "{{ container_config_directory }}/ceph.client.radosgw.keyring",
"dest": "/etc/ceph/ceph.client.radosgw.keyring", "dest": "/etc/ceph/ceph.client.radosgw.keyring",
"owner": "ceph", "owner": "ceph",
"perm": "0600", "perm": "0600",
"optional": "True" "optional": true
}, },
{ {
"source": "{{ container_config_directory }}/ceph.monmap", "source": "{{ container_config_directory }}/ceph.monmap",
"dest": "/etc/ceph/ceph.monmap", "dest": "/etc/ceph/ceph.monmap",
"owner": "ceph", "owner": "ceph",
"perm": "0600", "perm": "0600",
"optional": "True" "optional": true
} }
] ]
} }

6
ansible/roles/ceph/templates/ceph-rgw.json.j2
View File

@ -11,15 +11,13 @@
"source": "{{ container_config_directory }}/ceph.client.admin.keyring", "source": "{{ container_config_directory }}/ceph.client.admin.keyring",
"dest": "/etc/ceph/ceph.client.admin.keyring", "dest": "/etc/ceph/ceph.client.admin.keyring",
"owner": "ceph", "owner": "ceph",
"perm": "0600", "perm": "0600"
"optional": "True"
}, },
{ {
"source": "{{ container_config_directory }}/ceph.client.radosgw.keyring", "source": "{{ container_config_directory }}/ceph.client.radosgw.keyring",
"dest": "/etc/ceph/ceph.client.radosgw.keyring", "dest": "/etc/ceph/ceph.client.radosgw.keyring",
"owner": "ceph", "owner": "ceph",
"perm": "0600", "perm": "0600"
"optional": "True"
} }
] ]
} }

4
ansible/roles/cinder/templates/cinder-backup.json.j2
View File

@ -12,14 +12,14 @@
"dest": "/etc/ceph/ceph.client.cinder-backup.keyring", "dest": "/etc/ceph/ceph.client.cinder-backup.keyring",
"owner": "cinder", "owner": "cinder",
"perm": "0600", "perm": "0600",
"optional": "true" "optional": {{ (not enable_ceph | bool) | string | lower }}
}, },
{ {
"source": "{{ container_config_directory }}/ceph.conf", "source": "{{ container_config_directory }}/ceph.conf",
"dest": "/etc/ceph/ceph.conf", "dest": "/etc/ceph/ceph.conf",
"owner": "cinder", "owner": "cinder",
"perm": "0600", "perm": "0600",
"optional": "true" "optional": {{ (not enable_ceph | bool) | string | lower }}
} }
] ]
} }

4
ansible/roles/cinder/templates/cinder-volume.json.j2
View File

@ -12,14 +12,14 @@
"dest": "/etc/ceph/ceph.client.cinder.keyring", "dest": "/etc/ceph/ceph.client.cinder.keyring",
"owner": "cinder", "owner": "cinder",
"perm": "0600", "perm": "0600",
"optional": "true" "optional": {{ (not enable_ceph | bool) | string | lower }}
}, },
{ {
"source": "{{ container_config_directory }}/ceph.conf", "source": "{{ container_config_directory }}/ceph.conf",
"dest": "/etc/ceph/ceph.conf", "dest": "/etc/ceph/ceph.conf",
"owner": "cinder", "owner": "cinder",
"perm": "0600", "perm": "0600",
"optional": "true" "optional": {{ (not enable_ceph | bool) | string | lower }}
} }
] ]
} }

4
ansible/roles/common/templates/heka.json.j2
View File

@ -7,7 +7,7 @@
"dest": "/etc/heka/heka-elasticsearch.toml", "dest": "/etc/heka/heka-elasticsearch.toml",
"owner": "heka", "owner": "heka",
"perm": "0600", "perm": "0600",
"optional": "True" "optional": {{ (not enable_central_logging | bool) | string | lower }}
}, },
{ {
"source": "{{ container_config_directory }}/heka-global.toml", "source": "{{ container_config_directory }}/heka-global.toml",
@ -51,7 +51,7 @@
"dest": "/etc/heka/heka-{{ swift_service }}.toml", "dest": "/etc/heka/heka-{{ swift_service }}.toml",
"owner": "heka", "owner": "heka",
"perm": "0600", "perm": "0600",
"optional": "True" "optional": {{ (not enable_swift | bool) | string | lower }}
}{% if not loop.last %},{% endif %} }{% if not loop.last %},{% endif %}
{% endfor %} {% endfor %}

2
ansible/roles/haproxy/templates/haproxy.json.j2
View File

@ -12,7 +12,7 @@
"dest": "/etc/haproxy/haproxy.pem", "dest": "/etc/haproxy/haproxy.pem",
"owner": "root", "owner": "root",
"perm": "0600", "perm": "0600",
"optional": "true" "optional": {{ (not kolla_enable_tls_external | bool) | string | lower }}
} }
] ]
} }

2
docker/base/set_configs.py
View File

@ -58,7 +58,7 @@ def validate_source(data):
if not exists: if not exists:
if data.get('optional'): if data.get('optional'):
LOG.warning("%s does not exist, but is not required", source) LOG.info("%s does not exist, but is not required", source)
return False return False
else: else:
LOG.error("The source to copy does not exist: %s", source) LOG.error("The source to copy does not exist: %s", source)