Merge "Move database creation into role (trove)"

inventory/group_vars/trove_all.yml

@@ -16,9 +16,6 @@
 swift_proxy_port: "{{ hostvars['localhost']['swift_proxy_port'] }}"
 
 trove_service_region: "{{ service_region }}"
-trove_galera_user: trove
-trove_galera_database_name: trove_service
-trove_galera_address: "{{ galera_address }}"
 
 # If there are any Ceilometer hosts in the environment, then enable its usage
 trove_ceilometer_enabled: "{{ (groups['trove_all'] is defined) and (groups['trove_all'] | length > 0) and (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}"

playbooks/os-trove-install.yml

@@ -20,8 +20,12 @@
   hosts: trove_all
   gather_facts: "{{ osa_gather_facts | default(True) }}"
   user: root
+  environment: "{{ deployment_environment_variables | default({}) }}"
+  tags:
+    - trove
   pre_tasks:
     - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+
     - include: common-tasks/oslomsg-rpc-vhost-user.yml
       static: no
       vars:
@@ -31,6 +35,7 @@
       when:
         - inventory_hostname == groups['trove_all'][0]
         - groups[trove_oslomsg_rpc_host_group] | length > 0
+
     - include: common-tasks/oslomsg-notify-vhost-user.yml
       static: no
       vars:
@@ -47,14 +52,7 @@
         log_dirs:
           - src: "/openstack/log/{{ inventory_hostname }}-trove"
             dest: "/var/log/trove"
-    - include: common-tasks/mysql-db-user.yml
-      static: no
-      vars:
-        user_name: "{{ trove_galera_user }}"
-        password: "{{ trove_galera_password }}"
-        login_host: "{{ trove_galera_address }}"
-        db_name: "{{ trove_galera_database_name }}"
-      when: inventory_hostname == groups['trove_all'][0]
+
     - include: common-tasks/unbound-clients.yml
       static: no
       when:
@@ -68,7 +66,3 @@
         rsyslog_client_log_rotate_file: trove_log_rotate
         rsyslog_client_log_dir: "/var/log/trove"
         rsyslog_client_config_name: "99-trove-rsyslog-client.conf"
-
-  environment: "{{ deployment_environment_variables | default({}) }}"
-  tags:
-    - trove