diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 8f54adaad1..200191e3ab 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -10,7 +10,7 @@ container_config_directory: "/var/lib/kolla/config_files" node_config: "{{ CONFIG_DIR | default('/etc/kolla') }}" # The directory to merge custom config files the kolla's config files -node_custom_config: "/etc/kolla/config" +node_custom_config: "{{ node_config }}/config" # The directory to store the config files on the destination node node_config_directory: "/etc/kolla" diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index 59ab190df5..d2d1d35840 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -43,7 +43,7 @@ #openstack_tag_suffix: "" # Location of configuration overrides -#node_custom_config: "/etc/kolla/config" +#node_custom_config: "{{ node_config }}/config" # This should be a VIP, an unused IP on your network that will float between # the hosts running keepalived for high-availability. If you want to run an diff --git a/releasenotes/notes/update-node-custom-config-7b378b25ce22779f.yaml b/releasenotes/notes/update-node-custom-config-7b378b25ce22779f.yaml new file mode 100644 index 0000000000..5669726969 --- /dev/null +++ b/releasenotes/notes/update-node-custom-config-7b378b25ce22779f.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + update the default value of node_custom_config to {{ node_config }}/config, + when specified using --configdir