From 3ab102c5008c9fe9d536466a48a4f512c20255e5 Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Wed, 12 Aug 2020 11:33:45 +0000
Subject: [PATCH] Updated from OpenStack Ansible Tests

Change-Id: Iff8acef9481ac4d6508e7e5b8bf817a5c9bc367d
---
 bindep.txt              |  1 +
 doc/requirements.txt    |  6 +++---
 tasks/service_setup.yml | 15 ++++++++-------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/bindep.txt b/bindep.txt
index 14f3d5f..bb77692 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -47,3 +47,4 @@ git               [platform:gentoo]
 # For SELinux
 libselinux-python3  [platform:redhat]
 libsemanage-python3 [platform:redhat]
+iptables [platform:redhat]
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 52fe55a..07801f8 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -9,8 +9,8 @@
 # openstack-ansible-tests repository. Once it merges there, the changes will
 # automatically be proposed to all the repositories which use it.
 
-sphinx>=2.0.0,!=2.1.0  # BSD
+sphinx>=2.0.0,!=2.1.0 # BSD
 sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD
-openstackdocstheme>=2.0.0 # Apache-2.0
-reno>=2.5.0 # Apache-2.0
+openstackdocstheme>=2.2.1 # Apache-2.0
+reno>=3.1.0 # Apache-2.0
 doc8>=0.6.0 # Apache-2.0
diff --git a/tasks/service_setup.yml b/tasks/service_setup.yml
index 9817aa1..9ab3cc9 100644
--- a/tasks/service_setup.yml
+++ b/tasks/service_setup.yml
@@ -32,9 +32,10 @@
     ansible_python_interpreter: "{{ _service_setup_host_python_interpreter }}"
   block:
     - name: Add keystone domain
-      os_keystone_domain:
+      openstack.cloud.os_keystone_domain:
         cloud: default
         state: present
+        description: "{{ _domain_name_description | default(omit) }}"
         name: "{{ _domain_name }}"
         endpoint_type: admin
         verify: "{{ not _service_adminuri_insecure }}"
@@ -45,7 +46,7 @@
       delay: 10
 
     - name: Add service project
-      os_project:
+      openstack.cloud.os_project:
         cloud: default
         state: present
         name: "{{ _project_name }}"
@@ -62,7 +63,7 @@
       delay: 10
 
     - name: Add services to the keystone service catalog
-      os_keystone_service:
+      openstack.cloud.os_keystone_service:
         cloud: default
         state: "{{ item.state | default('present') }}"
         name: "{{ item.name }}"
@@ -78,7 +79,7 @@
       delay: 10
 
     - name: Add keystone roles
-      os_keystone_role:
+      openstack.cloud.os_keystone_role:
         cloud: default
         state: present
         name: "{{ item.role }}"
@@ -97,7 +98,7 @@
       no_log: True
 
     - name: Add service users
-      os_user:
+      openstack.cloud.os_user:
         cloud: default
         state: present
         name: "{{ item.name }}"
@@ -121,7 +122,7 @@
       no_log: True
 
     - name: Add service users to the role
-      os_user_role:
+      openstack.cloud.os_user_role:
         cloud: default
         state: present
         user: "{{ item.name }}"
@@ -144,7 +145,7 @@
       no_log: True
 
     - name: Add endpoints to keystone endpoint catalog
-      os_keystone_endpoint:
+      openstack.cloud.os_keystone_endpoint:
         cloud: default
         state: "{{ item.state | default('present') }}"
         service: "{{ item.service }}"