Merge "Move database creation into role (gnocchi)"

playbooks/os-gnocchi-install.yml

@@ -16,30 +16,28 @@
 - name: Install Gnocchi components
   hosts: gnocchi_all
   user: root
+  environment: "{{ deployment_environment_variables | default({}) }}"
+  tags:
+    - gnocchi
   pre_tasks:
     - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
       static: no
       vars:
         list_of_bind_mounts: "{{ gnocchi_container_bind_mounts }}"
       when: (gnocchi_storage_driver == "file") or (gnocchi_storage_driver is not defined)
+
     - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
       static: no
       when:
         - gnocchi_storage_driver is defined
         - gnocchi_storage_driver != "file"
+
     - include: common-tasks/os-log-dir-setup.yml
       vars:
         log_dirs:
           - src: "/openstack/log/{{ inventory_hostname }}-gnocchi"
             dest: "/var/log/gnocchi"
-    - include: common-tasks/mysql-db-user.yml
-      static: no
-      vars:
-        user_name: "{{ gnocchi_galera_user }}"
-        password: "{{ gnocchi_container_mysql_password }}"
-        login_host: "{{ gnocchi_galera_address }}"
-        db_name: "{{ gnocchi_galera_database }}"
-      when: inventory_hostname == groups['gnocchi_all'][0]
+
     - include: common-tasks/unbound-clients.yml
       static: no
       when:
@@ -53,6 +51,7 @@
         - (gnocchi_storage_driver | default('none') | lower == 'ceph')
       tags:
         - ceph
+
     - role: "os_gnocchi"
 
   post_tasks:
@@ -61,11 +60,3 @@
         rsyslog_client_log_rotate_file: gnocchi_log_rotate
         rsyslog_client_log_dir: "/var/log/gnocchi"
         rsyslog_client_config_name: "99-gnocchi-rsyslog-client.conf"
-
-  vars:
-    gnocchi_galera_user: gnocchi
-    gnocchi_galera_database: gnocchi
-    gnocchi_galera_address: "{{ galera_address }}"
-  environment: "{{ deployment_environment_variables | default({}) }}"
-  tags:
-    - gnocchi