From a7f4df532fa34b8b0c798e6afbe4b322fb28c8b9 Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Mon, 19 Oct 2020 09:20:06 +0000
Subject: [PATCH] Updated from OpenStack Ansible Tests

Depends-On: https://review.opendev.org/758953
Change-Id: Ie75b18dd4399030089f8048a53688f5c1d52f35e
---
 tasks/db_setup.yml      |  4 ++--
 tasks/mq_setup.yml      | 12 ++++++------
 tasks/service_setup.yml | 14 +++++++-------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/tasks/db_setup.yml b/tasks/db_setup.yml
index aca206e4..09b01f82 100644
--- a/tasks/db_setup.yml
+++ b/tasks/db_setup.yml
@@ -28,7 +28,7 @@
     - common-mariadb
   block:
     - name: Create database for service
-      mysql_db:
+      community.mysql.mysql_db:
         name: "{{ item.name }}"
         login_host: "{{ _oslodb_setup_endpoint | default(omit) }}"
         login_port: "{{ _oslodb_setup_port | default(omit) }}"
@@ -36,7 +36,7 @@
       no_log: true
 
     - name: Grant access to the database for the service
-      mysql_user:
+      community.mysql.mysql_user:
         name: "{{ item.1.username }}"
         password: "{{ item.1.password }}"
         host: "{{ item.1.host | default('%') }}"
diff --git a/tasks/mq_setup.yml b/tasks/mq_setup.yml
index dd6e02ed..3e2a3634 100644
--- a/tasks/mq_setup.yml
+++ b/tasks/mq_setup.yml
@@ -29,12 +29,12 @@
     - common-rabbitmq
   block:
     - name: Add RPC RabbitMQ vhost
-      rabbitmq_vhost:
+      community.rabbitmq.rabbitmq_vhost:
         name: "{{ _oslomsg_rpc_vhost }}"
         state: "present"
 
     - name: Apply RPC RabbitMQ vhost policies
-      rabbitmq_policy:
+      community.rabbitmq.rabbitmq_policy:
         name: "{{ item.name }}"
         pattern: "{{ item.pattern }}"
         priority: "{{ item.priority | default(0) }}"
@@ -43,7 +43,7 @@
       loop: "{{ _oslomsg_rpc_policies | default([]) + oslomsg_rpc_policies }}"
 
     - name: Add RPC RabbitMQ user
-      rabbitmq_user:
+      community.rabbitmq.rabbitmq_user:
         user: "{{ _oslomsg_rpc_userid }}"
         password: "{{ _oslomsg_rpc_password }}"
         update_password: always
@@ -63,7 +63,7 @@
     - common-rabbitmq
   block:
     - name: Add Notify RabbitMQ vhost
-      rabbitmq_vhost:
+      community.rabbitmq.rabbitmq_vhost:
         name: "{{ _oslomsg_notify_vhost }}"
         state: "present"
       when:
@@ -71,7 +71,7 @@
           (_oslomsg_notify_vhost != _oslomsg_rpc_vhost)
 
     - name: Apply Notify RabbitMQ vhost policies
-      rabbitmq_policy:
+      community.rabbitmq.rabbitmq_policy:
         name: "{{ item.name }}"
         pattern: "{{ item.pattern }}"
         priority: "{{ item.priority | default(0) }}"
@@ -83,7 +83,7 @@
           (_oslomsg_notify_vhost != _oslomsg_rpc_vhost)
 
     - name: Add Notify RabbitMQ user
-      rabbitmq_user:
+      community.rabbitmq.rabbitmq_user:
         user: "{{ _oslomsg_notify_userid }}"
         password: "{{ _oslomsg_notify_password }}"
         update_password: always
diff --git a/tasks/service_setup.yml b/tasks/service_setup.yml
index 9ab3cc9d..f9200c28 100644
--- a/tasks/service_setup.yml
+++ b/tasks/service_setup.yml
@@ -32,7 +32,7 @@
     ansible_python_interpreter: "{{ _service_setup_host_python_interpreter }}"
   block:
     - name: Add keystone domain
-      openstack.cloud.os_keystone_domain:
+      openstack.cloud.identity_domain:
         cloud: default
         state: present
         description: "{{ _domain_name_description | default(omit) }}"
@@ -46,7 +46,7 @@
       delay: 10
 
     - name: Add service project
-      openstack.cloud.os_project:
+      openstack.cloud.project:
         cloud: default
         state: present
         name: "{{ _project_name }}"
@@ -63,7 +63,7 @@
       delay: 10
 
     - name: Add services to the keystone service catalog
-      openstack.cloud.os_keystone_service:
+      openstack.cloud.catalog_service:
         cloud: default
         state: "{{ item.state | default('present') }}"
         name: "{{ item.name }}"
@@ -79,7 +79,7 @@
       delay: 10
 
     - name: Add keystone roles
-      openstack.cloud.os_keystone_role:
+      openstack.cloud.identity_role:
         cloud: default
         state: present
         name: "{{ item.role }}"
@@ -98,7 +98,7 @@
       no_log: True
 
     - name: Add service users
-      openstack.cloud.os_user:
+      openstack.cloud.identity_user:
         cloud: default
         state: present
         name: "{{ item.name }}"
@@ -122,7 +122,7 @@
       no_log: True
 
     - name: Add service users to the role
-      openstack.cloud.os_user_role:
+      openstack.cloud.role_assignment:
         cloud: default
         state: present
         user: "{{ item.name }}"
@@ -145,7 +145,7 @@
       no_log: True
 
     - name: Add endpoints to keystone endpoint catalog
-      openstack.cloud.os_keystone_endpoint:
+      openstack.cloud.endpoint:
         cloud: default
         state: "{{ item.state | default('present') }}"
         service: "{{ item.service }}"