Fix 'optional' config.json values
These values are optional only when the services are not enabled. If the file does not exist we should not warn, but rather inform. Ceph-mon is an exception here since its bootstrap process means the files may or may not exist initially. TrivialFix Change-Id: Ic02bece76d480e99deecf612036f37abb5604135
This commit is contained in:
parent
0a1486a2c7
commit
f4175f04d7
@ -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
|
||||
}
|
||||
]
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
@ -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 }}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
@ -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 }}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
@ -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 %}
|
||||
|
||||
|
@ -12,7 +12,7 @@
|
||||
"dest": "/etc/haproxy/haproxy.pem",
|
||||
"owner": "root",
|
||||
"perm": "0600",
|
||||
"optional": "true"
|
||||
"optional": {{ (not kolla_enable_tls_external | bool) | string | lower }}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
@ -58,7 +58,7 @@ def validate_source(data):
|
||||
|
||||
if not exists:
|
||||
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
|
||||
else:
|
||||
LOG.error("The source to copy does not exist: %s", source)
|
||||
|
Loading…
Reference in New Issue
Block a user