Merge "[CI] Fix mos jobs to work with keysone v2.0 and v3"
This commit is contained in:
commit
0739eba359
@ -1,24 +1,45 @@
|
||||
---
|
||||
{%- include "sahara.yaml" %}
|
||||
{%- set keystone_version = keystone_version|default("v2.0") %}
|
||||
{% if keystone_version == "v2.0" %}
|
||||
|
||||
KeystoneBasic.create_user:
|
||||
SaharaNodeGroupTemplates.create_and_list_node_group_templates:
|
||||
-
|
||||
args: {}
|
||||
args:
|
||||
hadoop_version: "{{sahara_hadoop_version}}"
|
||||
flavor:
|
||||
name: "m1.small"
|
||||
runner:
|
||||
type: "constant"
|
||||
times: 1
|
||||
concurrency: 1
|
||||
context:
|
||||
users:
|
||||
tenants: 1
|
||||
users_per_tenant: 1
|
||||
api_versions:
|
||||
sahara:
|
||||
service_type: {{sahara_service_type}}
|
||||
sla:
|
||||
failure_rate:
|
||||
max: 0
|
||||
|
||||
KeystoneBasic.create_delete_user:
|
||||
SaharaNodeGroupTemplates.create_delete_node_group_templates:
|
||||
-
|
||||
args: {}
|
||||
args:
|
||||
hadoop_version: "{{sahara_hadoop_version}}"
|
||||
flavor:
|
||||
name: "m1.small"
|
||||
runner:
|
||||
type: "constant"
|
||||
times: 1
|
||||
concurrency: 1
|
||||
context:
|
||||
users:
|
||||
tenants: 1
|
||||
users_per_tenant: 1
|
||||
api_versions:
|
||||
sahara:
|
||||
service_type: {{sahara_service_type}}
|
||||
sla:
|
||||
failure_rate:
|
||||
max: 0
|
||||
@ -34,17 +55,6 @@
|
||||
failure_rate:
|
||||
max: 0
|
||||
|
||||
KeystoneBasic.create_and_list_users:
|
||||
-
|
||||
args: {}
|
||||
runner:
|
||||
type: "constant"
|
||||
times: 1
|
||||
concurrency: 1
|
||||
sla:
|
||||
failure_rate:
|
||||
max: 0
|
||||
|
||||
KeystoneBasic.create_tenant:
|
||||
-
|
||||
args: {}
|
||||
@ -71,6 +81,41 @@
|
||||
failure_rate:
|
||||
max: 0
|
||||
|
||||
{% endif %}
|
||||
|
||||
KeystoneBasic.create_user:
|
||||
-
|
||||
args: {}
|
||||
runner:
|
||||
type: "constant"
|
||||
times: 1
|
||||
concurrency: 1
|
||||
sla:
|
||||
failure_rate:
|
||||
max: 0
|
||||
|
||||
KeystoneBasic.create_delete_user:
|
||||
-
|
||||
args: {}
|
||||
runner:
|
||||
type: "constant"
|
||||
times: 1
|
||||
concurrency: 1
|
||||
sla:
|
||||
failure_rate:
|
||||
max: 0
|
||||
|
||||
KeystoneBasic.create_and_list_users:
|
||||
-
|
||||
args: {}
|
||||
runner:
|
||||
type: "constant"
|
||||
times: 1
|
||||
concurrency: 1
|
||||
sla:
|
||||
failure_rate:
|
||||
max: 0
|
||||
|
||||
KeystoneBasic.create_delete_user:
|
||||
-
|
||||
args: {}
|
||||
@ -842,7 +887,6 @@
|
||||
wp_image: fedora
|
||||
image: fedora
|
||||
network_id: {{external_net_id}}
|
||||
router_id: {{external_router_id}}
|
||||
context:
|
||||
users:
|
||||
tenants: 1
|
||||
|
Loading…
x
Reference in New Issue
Block a user