Merge "Move database creation into role (cinder)"

inventory/group_vars/cinder_all.yml

@@ -23,11 +23,6 @@ cinder_service_backup_program_enabled: "{{ hostvars['localhost']['cinder_service
 # If there are any Ceilometer hosts in the environment, then enable its usage
 cinder_ceilometer_enabled: "{{ (groups['cinder_all'] is defined) and (groups['cinder_all'] | length > 0) and (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}"
 
-# The MySQL details for the cinder service
-cinder_galera_user: cinder
-cinder_galera_database: cinder
-cinder_galera_address: "{{ galera_address }}"
-
 # The address used to listen for communications
 cinder_management_address: "{{ ansible_host }}"
 

playbooks/os-cinder-install.yml

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Prepare MQ/DB services
+- name: Prepare MQ services
   hosts: cinder_all
   gather_facts: no
   user: root
@@ -45,15 +45,6 @@
         - groups[cinder_oslomsg_notify_host_group] | length > 0
       run_once: yes
 
-    - name: Configure MySQL user
-      include: common-tasks/mysql-db-user.yml
-      vars:
-        user_name: "{{ cinder_galera_user }}"
-        password: "{{ cinder_container_mysql_password }}"
-        login_host: "{{ cinder_galera_address }}"
-        db_name: "{{ cinder_galera_database }}"
-      run_once: yes
-
 
 
 - name: Install cinder scheduler services