Delete gnocchi_identity_setup

This file duplicates the purpose of the service_setup.yml
so we're running same set of tasks twice.

Change-Id: Ia0ee853b14cffd3082346e20bb021da24e3f2c40

tasks/gnocchi_identity_setup.yml

@@ -1,70 +0,0 @@
----
-# Copyright 2016, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Create the project if needed, assumed to be in default domain.
-# In many cases this will be present but under some circumstances the project
-# may be unique to Gnocchi, esp. when Swift is used for storage.
-# We set the python interpreter to the ansible runtime venv if
-# the delegation is to localhost so that we get access to the
-# appropriate python libraries in that venv. If the delegation
-# is to another host, we assume that it is accessible by the
-# system python instead.
-- name: Setup the service
-  delegate_to: "{{ gnocchi_service_setup_host }}"
-  vars:
-    ansible_python_interpreter: "{{ gnocchi_service_setup_host_python_interpreter }}"
-  block:
-    - name: Add service project
-      openstack.cloud.os_project:
-        cloud: default
-        state: present
-        name: "{{ gnocchi_service_project_name }}"
-        domain_id: "{{ gnocchi_service_project_domain_id }}"
-        endpoint_type: admin
-        verify: "{{ not keystone_service_adminuri_insecure }}"
-      register: add_service
-      until: add_service is success
-      retries: 5
-      delay: 10
-
-    - name: Add service user
-      openstack.cloud.os_user:
-        cloud: default
-        state: present
-        name: "{{ gnocchi_service_user_name }}"
-        password: "{{ gnocchi_service_password }}"
-        domain: default
-        default_project: "{{ gnocchi_service_project_name }}"
-        endpoint_type: admin
-        verify: "{{ not keystone_service_adminuri_insecure }}"
-      register: add_service
-      until: add_service is success
-      retries: 5
-      delay: 10
-      no_log: True
-
-    - name: Add service user to admin role
-      openstack.cloud.os_user_role:
-        cloud: default
-        state: present
-        user: "{{ gnocchi_service_user_name }}"
-        role: "{{ gnocchi_role_name }}"
-        project: "{{ gnocchi_service_project_name }}"
-        endpoint_type: admin
-        verify: "{{ not keystone_service_adminuri_insecure }}"
-      register: add_service
-      until: add_service is success
-      retries: 5
-      delay: 10

tasks/main.yml

@@ -104,6 +104,13 @@
     _service_setup_host_python_interpreter: "{{ gnocchi_service_setup_host_python_interpreter }}"
     _service_region: "{{ gnocchi_service_region }}"
     _service_in_ldap: "{{ gnocchi_service_in_ldap }}"
+    _service_project_name: "{{ gnocchi_service_project_name }}"
+    _project_name: "{{ gnocchi_service_project_name }}"
+    _project_domain: "{{ gnocchi_service_project_domain_id }}"
+    _service_users:
+      - name: "{{ gnocchi_service_user_name }}"
+        password: "{{ gnocchi_service_password }}"
+        role: "{{ gnocchi_role_name }}"
     _service_endpoints:
       - service: "{{ gnocchi_service_name }}"
         interface: "public"
@@ -124,11 +131,6 @@
   tags:
     - gnocchi-config
 
-- import_tasks: gnocchi_identity_setup.yml
-  when: _gnocchi_is_first_play_host
-  tags:
-    - gnocchi-config
-
 - import_tasks: gnocchi_ceph_python_libs.yml
   when:
     - gnocchi_storage_driver == 'ceph'