Merge "Move database creation into role (sahara)"

inventory/group_vars/sahara_all.yml

@@ -17,8 +17,6 @@ sahara_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups
 sahara_service_region: "{{ service_region }}"
 sahara_service_in_ldap: "{{ service_ldap_backend_enabled }}"
 
-sahara_galera_address: "{{ galera_address }}"
-
 # venv fetch configuration
 sahara_venv_tag: "{{ venv_tag }}"
 sahara_venv_download_url: "{{ venv_base_download_url }}/sahara-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz"

playbooks/os-sahara-install.yml

@@ -15,6 +15,9 @@
   hosts: sahara_all
   gather_facts: "{{ osa_gather_facts | default(True) }}"
   user: root
+  environment: "{{ deployment_environment_variables | default({}) }}"
+  tags:
+    - sahara
   pre_tasks:
     - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
 
@@ -46,14 +49,7 @@
         log_dirs:
           - src: "/openstack/log/{{ inventory_hostname }}-sahara"
             dest: "/var/log/sahara"
-    - include: common-tasks/mysql-db-user.yml
-      static: no
-      vars:
-        user_name: "{{ sahara_galera_user }}"
-        password: "{{ sahara_container_mysql_password }}"
-        login_host: "{{ sahara_galera_address }}"
-        db_name: "{{ sahara_galera_database }}"
-      when: inventory_hostname == groups['sahara_all'][0]
+
     - include: common-tasks/unbound-clients.yml
       static: no
       when:
@@ -67,7 +63,3 @@
         rsyslog_client_log_rotate_file: sahara_log_rotate
         rsyslog_client_log_dir: "/var/log/sahara"
         rsyslog_client_config_name: "99-sahara-rsyslog-client.conf"
-
-  environment: "{{ deployment_environment_variables | default({}) }}"
-  tags:
-    - sahara