Skip to content
Snippets Groups Projects
Commit fe1f7e29 authored by Jenkins's avatar Jenkins Committed by Gerrit Code Review
Browse files

Merge "Fix 'optional' config.json values"

parents 4d37a8a3 f4175f04
No related branches found
No related tags found
No related merge requests found
......@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment