diff --git a/etc/kolla/defaults.yml b/ansible/group_vars/all.yml
similarity index 74%
rename from etc/kolla/defaults.yml
rename to ansible/group_vars/all.yml
index 8b096cb0ea..0d0100d8a2 100644
--- a/etc/kolla/defaults.yml
+++ b/ansible/group_vars/all.yml
@@ -56,3 +56,20 @@ enable_mariadb: "yes"
 enable_neutron: "yes"
 enable_nova: "yes"
 enable_rabbitmq: "yes"
+
+
+# Openstack authentication strings. You should only need to adjust these if you
+# are changing the admin tenant/project or user.
+openstack_auth:
+    auth_url: "http://{{ kolla_internal_address }}:{{ keystone_admin_port }}"
+    username: "admin"
+    password: "{{ keystone_admin_password }}"
+    project_name: "admin"
+
+# This shouldn't be needed for long. It is only temporary until we get the
+# ansible modules sorted out
+openstack_auth_v2:
+    auth_url: "http://{{ kolla_internal_address }}:{{ keystone_admin_port }}/v2.0"
+    username: "admin"
+    password: "{{ keystone_admin_password }}"
+    project_name: "admin"
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index ec78f12519..d31a1b6176 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -74,20 +74,6 @@ openstack_logging_debug: "False"
 
 openstack_region_name: "RegionOne"
 
-openstack_auth:
-    auth_url: "http://{{ kolla_internal_address }}:{{ keystone_admin_port }}"
-    username: "admin"
-    password: "{{ keystone_admin_password }}"
-    project_name: "admin"
-
-# This shouldn't be needed for long. It is only temporary until we get the
-# ansible modules sorted out
-openstack_auth_v2:
-    auth_url: "http://{{ kolla_internal_address }}:{{ keystone_admin_port }}/v2.0"
-    username: "admin"
-    password: "{{ keystone_admin_password }}"
-    project_name: "admin"
-
 
 ####################
 # RabbitMQ options
diff --git a/tools/kolla-ansible b/tools/kolla-ansible
index 43341788d0..abfe433fb0 100755
--- a/tools/kolla-ansible
+++ b/tools/kolla-ansible
@@ -70,7 +70,7 @@ case "$1" in
 
 (deploy)
         ACTION="Deploying Playbook"
-        CMD="ansible-playbook -i $INVENTORY -e @/etc/kolla/defaults.yml -e @/etc/kolla/globals.yml -e @/etc/kolla/passwords.yml $PLAYBOOK"
+        CMD="ansible-playbook -i $INVENTORY -e @/etc/kolla/globals.yml -e @/etc/kolla/passwords.yml $PLAYBOOK"
         ;;
 
 (*)     usage