Skip to content
Snippets Groups Projects
Commit 8c6ca860 authored by Mark Goddard's avatar Mark Goddard
Browse files

Fix defaults for environment variable lookups

The env lookup plugin returns None if the environment variable is not
defined, which does not count as undefined. This means the default filter
will not replace the value. We pass true as the second argument to default
in order to interpret the value as a boolean when determining if it is
defined.
parent b0983e82
No related branches found
No related tags found
No related merge requests found
......@@ -5,10 +5,10 @@
# Path configuration.
# Path to Kayobe configuration directory.
kayobe_config_path: "{{ lookup('env', 'KAYOBE_CONFIG_PATH') | default('/etc/kayobe') }}"
kayobe_config_path: "{{ lookup('env', 'KAYOBE_CONFIG_PATH') | default('/etc/kayobe', true) }}"
# Path in which to store data locally.
base_path: "{{ lookup('env', 'KAYOBE_BASE_PATH') | default('/opt/kayobe') }}"
base_path: "{{ lookup('env', 'KAYOBE_BASE_PATH') | default('/opt/kayobe', true) }}"
# Path in which to cache downloaded images.
image_cache_path: "{{ base_path ~ '/images' }}"
......
......@@ -26,7 +26,7 @@ kolla_venv: "{{ virtualenv_path ~ '/kolla' }}"
# Kolla configuration.
# Path to Kolla configuration directory.
kolla_config_path: "{{ lookup('env', 'KOLLA_CONFIG_PATH') | default('/etc/kolla') }}"
kolla_config_path: "{{ lookup('env', 'KOLLA_CONFIG_PATH') | default('/etc/kolla', true) }}"
# Path to Kolla node custom configuration directory.
kolla_node_custom_config_path: "{{ kolla_config_path }}/config"
......
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