Fix Master

Once we moved to OpenStack gerrit the first push broke some things.

Change-Id: Idf18f7aff4d3067b8791e184d333f7893239ed19
This commit is contained in:
Joe Talerico 2016-06-14 10:20:04 -04:00
parent 06e3e3292b
commit f6df2acade
2 changed files with 223 additions and 362 deletions

0
lib/__init__.py Normal file
View File

View File

@ -1,372 +1,233 @@
name: name: Browbeat configuration schema
Browbeat configuration schema type: map
type: allowempty: True
map
allowempty:
True
mapping: mapping:
browbeat: browbeat:
required: required: True
True type: map
type: mapping:
map results:
mapping: type: str
results: required: True
type: rerun:
str type: int
required: required: True
True
rerun:
type:
int
required:
True
ansible: ansible:
required: required: True
True type: map
type: allowempty: True
map mapping:
allowempty: hosts:
True type: str
adjust:
type: map
mapping: mapping:
hosts: keystone_token:
type: type: str
str neutron_l3:
adjust: type: str
type: nova_db:
map type: str
mapping: workers:
keystone_token: type: str
type: grafana_snapshot:
str type: str
neutron_l3: required: True
type: shaker_build:
str type: str
nova_db:
type:
str
workers:
type:
str
grafana_snapshot:
type:
str
required:
True
shaker_build:
type:
str
connmon: connmon:
type: type: map
map allowempty: True
allowempty: mapping:
True enabled:
type: bool
required: True
grafana:
required: True
type: map
allowempty: True
mapping:
enabled:
type: bool
required: True
cloud_name:
type: str
grafana_ip:
type: str
pattern: ^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])(\.([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]{0,61}[a-zA-Z0-9]))*$
grafana_port:
type: int
dashboards:
type: seq
sequence:
- type: str
snapshot:
type: map
mapping: mapping:
enabled:
type: bool
required: True
snapshot_compute:
type: bool
required: True
perfkit:
required: False
type: map
allowempty: True
mapping:
enabled:
type: bool
required: True
sleep_before:
type: number
required: True
sleep_after:
type: number
required: True
venv:
type: str
required: True
default:
type: map
required: True
mapping:
image:
type: str
required: True
machine_type:
type: str
required: True
os_type:
type: str
required: True
enum: ['rhel', 'debian', 'ubuntu_container', 'windows']
openstack_image_username:
type: str
required: True
openstack_floating_ip_pool:
type: str
required: True
openstack_network:
type: str
required: True
benchmarks:
type: seq
sequence:
- type: map
allowempty: True
mapping:
name:
type: str
required: True
enabled: enabled:
type: type: bool
bool required: True
required:
True
grafana:
required:
True
type:
map
allowempty:
True
mapping:
enabled:
type:
bool
required:
True
cloud_name:
type:
str
grafana_ip:
type:
str
pattern:
^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\- ]{0, 61}[a-zA-Z0-9])(\.([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\- ]{0, 61}[a-zA-Z0-9]))*$
grafana_port:
type:
int
dashboards:
type:
seq
sequence:
- type:
str
snapshot:
type:
map
mapping:
enabled:
type:
bool
required:
True
snapshot_compute:
type:
bool
required:
True
perfkit:
required:
False
type:
map
allowempty:
True
mapping:
enabled:
type:
bool
required:
True
sleep_before:
type:
number
required:
True
sleep_after:
type:
number
required:
True
venv:
type:
str
required:
True
default:
type:
map
required:
True
mapping:
image:
type:
str
required:
True
machine_type:
type:
str
required:
True
os_type:
type:
str
required:
True
enum:
['rhel', 'debian', 'ubuntu_container', 'windows']
openstack_image_username:
type:
str
required:
True
openstack_floating_ip_pool:
type:
str
required:
True
openstack_network:
type:
str
required:
True
benchmarks: benchmarks:
type: type: str
seq required: True
sequence:
- type:
map
allowempty:
True
mapping:
name:
type:
str
required:
True
enabled:
type:
bool
required:
True
benchmarks:
type:
str
required:
True
shaker: shaker:
required: required: False
False allowempty: True
allowempty: type: map
True mapping:
type: enabled:
map type: bool
mapping: required: True
server:
type: str
required: True
pattern: ^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])(\.([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]{0,61}[a-zA-Z0-9]))*$
port:
type: int
required: True
flavor:
type: str
required: True
join_timeout:
type: int
required: True
sleep_before:
type: number
required: True
sleep_after:
type: number
required: True
venv:
type: str
required: True
shaker_region:
type: str
required: true
scenarios:
type: seq
sequence:
- type: map
allowempty: True
mapping:
name:
type: str
required: True
enabled: enabled:
type: type: bool
bool required: True
required: file:
True type: str
server: required: True
type:
str rally:
required: required: False
True type: map
pattern: allowempty: True
^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]{0, 61}[a-zA-Z0-9])(\.([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\- ]{0, 61}[a-zA-Z0-9]))*$ mapping:
port: enabled:
type: type: bool
int required: True
required: sleep_before:
True type: number
flavor: required: True
type: sleep_after:
str type: number
required: required: True
True venv:
join_timeout: type: str
type: required: True
int benchmarks:
required: type: seq
True required: True
sleep_before: sequence:
type: - type: map
number mapping:
required: name:
True type: str
sleep_after: required: True
type: enabled:
number required: True
required: type: bool
True concurrency:
venv: type: seq
type: required: True
str sequence:
required: - type: int
True times:
shaker_region: type: int
type: required: True
str
required:
true
scenarios: scenarios:
type: type: seq
seq sequence:
sequence: - type: map
- type: allowempty: True
map mapping:
allowempty: name:
True type: str
mapping: required: True
name: enabled:
type: type: bool
str required: True
required: file:
True type: str
enabled: required: True
type:
bool
required:
True
file:
type:
str
required:
True
rally:
required:
False
type:
map
allowempty:
True
mapping:
enabled:
type:
bool
required:
True
sleep_before:
type:
number
required:
True
sleep_after:
type:
number
required:
True
venv:
type:
str
required:
True
benchmarks:
type:
seq
required:
True
sequence:
- type:
map
mapping:
name:
type:
str
required:
True
enabled:
required:
True
type:
bool
concurrency:
type:
seq
required:
True
sequence:
- type:
int
times:
type:
int
required:
True
scenarios:
type:
seq
sequence:
- type:
map
allowempty:
True
mapping:
name:
type:
str
required:
True
enabled:
type:
bool
required:
True
file:
type:
str
required:
True