Merge "Remove custom policy file and tempest role in case of contrail" into release/2019.2.0
diff --git a/runtest/salttest/states/openstack/keystonev3.sls b/runtest/salttest/states/openstack/keystonev3.sls
index 1dc2119..9da7f87 100644
--- a/runtest/salttest/states/openstack/keystonev3.sls
+++ b/runtest/salttest/states/openstack/keystonev3.sls
@@ -5,6 +5,16 @@
{%- set Keystone_Test_Role = 'TestKeystoneRole' %}
{%- set Keystone_Test_Endpoint = 'TestKeystoneEndpoint' %}
+keystone_domain_present:
+ keystonev3.domain_present:
+ - cloud_name: admin_identity
+ - name: {{ Keystone_Test_Domain }}
+ - description: Description
+ - enabled: True
+ - tags:
+ - 'someTag0'
+ - 'someTag1'
+
keystonev3_service_present:
keystonev3.service_present:
- name: {{ Keystone_Test_Service }}
@@ -81,3 +91,9 @@
keystonev3.user_absent:
- name: {{ Keystone_Test_User }}
- cloud_name: admin_identity
+
+keystone_domain_absent:
+ keystonev3.domain_absent:
+ - cloud_name: admin_identity
+ - name: {{ Keystone_Test_Domain }}
+ - force_delete: True