diff --git a/defaults/main.yml b/defaults/main.yml
index 49d27c2..951905f 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -34,6 +34,7 @@ trove_regular_user_name: regular_trove_user
 trove_admin_user_name: admin_trove_user
 
 trove_service_name: trove
+trove_service_user_name: trove
 trove_service_tenant_name: trove_for_trove_usage
 trove_service_type: database
 trove_service_description: "OpenStack DBaaS (Trove)"
@@ -119,6 +120,8 @@ trove_rabbitmq_servers: "{{ rabbitmq_servers }}"
 trove_keystone_auth_plugin: password
 trove_service_project_domain_name: Default
 trove_service_user_domain_name: default
+trove_service_project_domain_id: default
+trove_service_user_domain_id: default
 
 trove_conductor_service_name: "{{ trove_conductor_program_name }}"
 trove_taskmanager_service_name: "{{ trove_taskmanager_program_name }}"
diff --git a/extras/os-trove-install.yml b/extras/os-trove-install.yml
index 17875ed..8faa5e8 100644
--- a/extras/os-trove-install.yml
+++ b/extras/os-trove-install.yml
@@ -43,7 +43,7 @@
         user_name: "{{ trove_galera_user }}"
         password: "{{ trove_galera_password }}"
         login_host: "{{ trove_galera_address }}"
-        db_name: "{{ trove_galera_database }}"
+        db_name: "{{ trove_galera_database_name }}"
       when: inventory_hostname == groups['trove_all'][0]
   roles:
     - role: "os_trove"
diff --git a/tests/test-install-trove.yml b/tests/test-install-trove.yml
index bd30748..5a884ec 100644
--- a/tests/test-install-trove.yml
+++ b/tests/test-install-trove.yml
@@ -55,7 +55,7 @@
         login_user: "{{ galera_root_user }}"
         login_password: "{{ galera_root_password }}"
         login_host: "{{ trove_galera_address }}"
-        name: "{{ trove_galera_database }}"
+        name: "{{ trove_galera_database_name }}"
         state: "present"
       delegate_to: "{{ hostvars[groups['galera_all'][0]]['ansible_host'] }}"
       when: inventory_hostname == groups['trove_all'][0]
@@ -64,11 +64,11 @@
         login_user: "{{ galera_root_user }}"
         login_password: "{{ galera_root_password }}"
         login_host: "{{ trove_galera_address }}"
-        name: "{{ trove_galera_database }}"
+        name: "{{ trove_galera_database_name }}"
         password: "{{ trove_galera_password }}"
         host: "{{ item }}"
         state: "present"
-        priv: "{{ trove_galera_database }}.*:ALL"
+        priv: "{{ trove_galera_database_name }}.*:ALL"
       with_items:
         - "localhost"
         - "%"
diff --git a/tests/test-vars.yml b/tests/test-vars.yml
index 525b537..518f527 100644
--- a/tests/test-vars.yml
+++ b/tests/test-vars.yml
@@ -18,7 +18,7 @@
 
 trove_developer_mode: True
 trove_galera_address: "{{ hostvars[groups['galera_all'][0]]['ansible_host'] }}"
-trove_galera_database: trove
+trove_galera_database_name: trove
 trove_galera_user: trove
 trove_galera_password: "secrete"
 trove_rabbitmq_port: "{{ rabbitmq_port }}"