Merge "Change default config location"

ansible/group_vars/all.yml

@@ -5,17 +5,14 @@
 # https://github.com/ansible/ansible-modules-core/issues/1227
 docker_api_version: "1.18"
 
-# TODO(SamYaple): remove references to these variables in Ansible
-kolla_directory: "/usr/share/kolla"
-koalla_directory: "/usr/share/kolla"
-
 # The "temp" files that are created before merge need to stay persistent due
 # to the fact that ansible will register a "change" if it has to create them
 # again. Persistent files allow for idempotency
 node_templates_directory: "/usr/share/kolla/templates"
 
 # The directory to store the config files on the destination node
-node_config_directory: "/opt/kolla/config"
+node_config_directory: "/etc/kolla"
+
 
 ###################
 # Kolla options