openstack/openstack-helm
Code Issues Proposed changes

Upgrade rally to 1.3.0

Browse Source 
Since rally 1.0, rally has been a platform for testing, and rally for
openstack has been separated by rally-openstack. The current version
of rally in openstack-helm is version 0.8 which corresponds to ocata.
This patch tests with the latest version of rally-openstack, version
1.3.0, and removes scenarios that are no longer in use.

Change-Id: I380a976c0f48c4af0796c9d866fc8787025ce548
This commit is contained in:
Jaesang Lee 2018-12-19 08:52:02 +00:00
parent 2fcfd668ad
commit 2a03fd65bf
16 changed files with 21 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceilometer/values.yaml
View File

@ -44,7 +44,7 @@ labels:
images:
tags:
test: docker.io/kolla/ubuntu-binary-rally:4.0.0
test: docker.io/xrally/xrally-openstack:1.3.0
db_init_mongodb: docker.io/mongo:3.4.9-jessie
db_init: docker.io/kolla/ubuntu-source-ceilometer-api:3.0.3
ceilometer_db_sync: docker.io/kolla/ubuntu-source-ceilometer-api:3.0.3

2
cinder/values.yaml
View File

@ -43,7 +43,7 @@ release_group: null
images:
tags:
test: docker.io/kolla/ubuntu-source-rally:4.0.0
test: docker.io/xrally/xrally-openstack:1.3.0
db_init: docker.io/openstackhelm/heat:ocata
cinder_db_sync: docker.io/openstackhelm/cinder:ocata
db_drop: docker.io/openstackhelm/heat:ocata

2
glance/values.yaml
View File

@ -38,7 +38,7 @@ release_group: null
images:
tags:
test: docker.io/kolla/ubuntu-source-rally:4.0.0
test: docker.io/xrally/xrally-openstack:1.3.0
glance_storage_init: docker.io/port/ceph-config-helper:v1.10.3
db_init: docker.io/openstackhelm/heat:ocata
glance_db_sync: docker.io/openstackhelm/glance:ocata

2
heat/values.yaml
View File

@ -41,7 +41,7 @@ labels:
images:
tags:
test: docker.io/kolla/ubuntu-source-rally:4.0.0
test: docker.io/xrally/xrally-openstack:1.3.0
bootstrap: docker.io/openstackhelm/heat:ocata
db_init: docker.io/openstackhelm/heat:ocata
heat_db_sync: docker.io/openstackhelm/heat:ocata

2
keystone/values.yaml
View File

@ -30,7 +30,7 @@ release_group: null
images:
tags:
bootstrap: docker.io/openstackhelm/heat:ocata
test: docker.io/kolla/ubuntu-source-rally:4.0.0
test: docker.io/xrally/xrally-openstack:1.3.0
db_init: docker.io/openstackhelm/heat:ocata
keystone_db_sync: docker.io/openstackhelm/keystone:ocata
db_drop: docker.io/openstackhelm/heat:ocata

2
mistral/values.yaml
View File

@ -41,7 +41,7 @@ release_group: null
images:
tags:
test: docker.io/kolla/ubuntu-source-rally:4.0.0
test: docker.io/xrally/xrally-openstack:1.3.0
bootstrap: docker.io/openstackhelm/heat:ocata
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
db_init: docker.io/openstackhelm/heat:ocata

2
neutron/values.yaml
View File

@ -22,7 +22,7 @@ release_group: null
images:
tags:
bootstrap: docker.io/openstackhelm/heat:ocata
test: docker.io/kolla/ubuntu-source-rally:4.0.0
test: docker.io/xrally/xrally-openstack:1.3.0
db_init: docker.io/openstackhelm/heat:ocata
neutron_db_sync: docker.io/openstackhelm/neutron:ocata
db_drop: docker.io/openstackhelm/heat:ocata

42
nova/values.yaml
View File

@ -87,7 +87,7 @@ images:
nova_service_cleaner: 'docker.io/port/ceph-config-helper:v1.10.3'
nova_spiceproxy: docker.io/openstackhelm/nova:ocata
nova_spiceproxy_assets: 'docker.io/kolla/ubuntu-source-nova-spicehtml5proxy:ocata'
test: 'docker.io/kolla/ubuntu-source-rally:4.0.0'
test: docker.io/xrally/xrally-openstack:1.3.0
image_repo_sync: docker.io/docker:17.07.0
local_registry:
active: false
@ -581,14 +581,6 @@ conf:
sla:
failure_rate:
max: 0
NovaHosts.list_hosts:
- runner:
concurrency: 1
times: 1
type: constant
sla:
failure_rate:
max: 0
NovaHypervisors.list_and_get_hypervisors:
- args:
detailed: true
@ -664,38 +656,6 @@ conf:
sla:
failure_rate:
max: 0
NovaSecGroup.create_and_delete_secgroups:
- args:
rules_per_security_group: 1
security_group_count: 1
runner:
concurrency: 1
times: 1
type: constant
sla:
failure_rate:
max: 0
NovaSecGroup.create_and_list_secgroups:
- args:
rules_per_security_group: 1
security_group_count: 1
runner:
concurrency: 1
times: 1
type: constant
sla:
failure_rate:
max: 0
NovaSecGroup.create_and_update_secgroups:
- args:
security_group_count: 1
runner:
concurrency: 1
times: 1
type: constant
sla:
failure_rate:
max: 0
NovaServerGroups.create_and_list_server_groups:
- args:
all_projects: false

6
rally/templates/bin/_manage-db.sh.tpl
View File

@ -19,12 +19,12 @@ limitations under the License.
set -ex
function create_or_update_db () {
revisionResults=$(rally-manage db revision)
revisionResults=$(rally db revision)
if [ $revisionResults = "None" ]
then
rally-manage db create
rally db create
else
rally-manage db upgrade
rally db upgrade
fi
}

137
rally/values.yaml
View File

@ -26,11 +26,11 @@ labels:
images:
tags:
bootstrap: docker.io/kolla/ubuntu-source-rally:ocata
bootstrap: docker.io/xrally/xrally-openstack:1.3.0
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
db_init: docker.io/kolla/ubuntu-source-rally:ocata
rally_db_sync: docker.io/kolla/ubuntu-source-rally:ocata
run_task: docker.io/kolla/ubuntu-source-rally:ocata
db_init: docker.io/xrally/xrally-openstack:1.3.0
rally_db_sync: docker.io/xrally/xrally-openstack:1.3.0
run_task: docker.io/xrally/xrally-openstack:1.3.0
ks_user: docker.io/openstackhelm/heat:ocata
ks_service: docker.io/openstackhelm/heat:ocata
ks_endpoints: docker.io/openstackhelm/heat:ocata
@ -11855,26 +11855,6 @@ conf:
concurrency: 2
times: 10
type: constant
NovaHosts.list_and_get_hosts:
-
args: {}
context:
users:
tenants: 2
users_per_tenant: 2
runner:
concurrency: 2
times: 10
type: constant
sla:
failure_rate:
max: 0
NovaHosts.list_hosts:
-
runner:
concurrency: 2
times: 10
type: constant
NovaHypervisors.list_and_get_hypervisors:
-
args:
@ -11998,115 +11978,6 @@ conf:
concurrency: 2
times: 10
type: constant
NovaSecGroup.boot_and_delete_server_with_secgroups:
-
args:
flavor:
name: m1.tiny
image:
name: cirros-0.3.5-x86_64-disk.img
rules_per_security_group: 10
security_group_count: 10
context:
network:
start_cidr: 100.1.0.0/26
users:
tenants: 3
users_per_tenant: 2
images:
image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img"
image_name: cirros-0.3.5-x86_64-disk.img
image_type: qcow2
image_container: bare
images_per_tenant: 1
runner:
concurrency: 2
times: 10
type: constant
NovaSecGroup.boot_server_and_add_secgroups:
-
args:
flavor:
name: m1.tiny
image:
name: cirros-0.3.5-x86_64-disk.img
rules_per_security_group: 10
security_group_count: 10
context:
network:
start_cidr: 100.1.0.0/26
users:
tenants: 3
users_per_tenant: 2
images:
image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img"
image_name: cirros-0.3.5-x86_64-disk.img
image_type: qcow2
image_container: bare
images_per_tenant: 1
runner:
concurrency: 2
times: 5
type: constant
sla:
failure_rate:
max: 0
NovaSecGroup.create_and_delete_secgroups:
-
args:
rules_per_security_group: 10
security_group_count: 10
context:
users:
tenants: 3
users_per_tenant: 2
runner:
concurrency: 2
times: 10
type: constant
NovaSecGroup.create_and_list_secgroups:
-
args:
rules_per_security_group: 10
security_group_count: 10
context:
users:
tenants: 3
users_per_tenant: 2
runner:
concurrency: 2
times: 10
type: constant
NovaSecGroup.create_and_update_secgroups:
-
args:
security_group_count: 10
context:
users:
tenants: 3
users_per_tenant: 2
runner:
concurrency: 2
times: 10
type: constant
NovaServerGroups.create_and_list_server_groups:
-
args:
all_projects: false
kwargs:
policies:
- affinity
context:
users:
tenants: 2
users_per_tenant: 2
runner:
concurrency: 2
times: 4
type: constant
sla:
failure_rate:
max: 0
NovaServers.boot_and_associate_floating_ip:
-
args:

2
tools/overrides/releases/newton/kolla.yaml
View File

@ -83,7 +83,7 @@ images:
senlin_engine: 'docker.io/kolla/ubuntu-source-senlin-engine:3.0.3'
senlin_engine_cleaner: 'docker.io/kolla/ubuntu-source-senlin-engine:3.0.3'
tempest: 'docker.io/kolla/ubuntu-source-tempest:3.0.3'
test: 'docker.io/kolla/ubuntu-source-rally:4.0.0'
test: 'docker.io/xrally/xrally-openstack:1.3.0'
pod:
user:
keystone:

2
tools/overrides/releases/newton/loci.yaml
View File

@ -79,4 +79,4 @@ images:
senlin_engine: 'docker.io/openstackhelm/senlin:newton'
senlin_engine_cleaner: 'docker.io/openstackhelm/senlin:newton'
tempest: 'docker.io/kolla/ubuntu-source-tempest:3.0.3'
test: 'docker.io/kolla/ubuntu-source-rally:4.0.0'
test: 'docker.io/xrally/xrally-openstack:1.3.0'

2
tools/overrides/releases/ocata/kolla.yaml
View File

@ -81,7 +81,7 @@ images:
senlin_engine: 'docker.io/kolla/ubuntu-source-senlin-engine:ocata'
senlin_engine_cleaner: 'docker.io/kolla/ubuntu-source-senlin-engine:ocata'
tempest: 'docker.io/kolla/ubuntu-source-tempest:4.0.3'
test: 'docker.io/kolla/ubuntu-source-rally:4.0.0'
test: 'docker.io/xrally/xrally-openstack:1.3.0'
pod:
#NOTE(portdirect): see https://github.com/openstack/kolla/blob/f62f5ae2fa5e7808722f9b37b48a50b39c20b46d/kolla/common/config.py#L695-L998
user:

2
tools/overrides/releases/ocata/loci.yaml
View File

@ -79,4 +79,4 @@ images:
senlin_engine: 'docker.io/openstackhelm/senlin:ocata'
senlin_engine_cleaner: 'docker.io/openstackhelm/senlin:ocata'
tempest: 'docker.io/kolla/ubuntu-source-tempest:4.0.3'
test: 'docker.io/kolla/ubuntu-source-rally:4.0.0'
test: 'docker.io/xrally/xrally-openstack:1.3.0'

2
tools/overrides/releases/pike/kolla.yaml
View File

@ -81,7 +81,7 @@ images:
senlin_engine: 'docker.io/kolla/ubuntu-source-senlin-engine:pike'
senlin_engine_cleaner: 'docker.io/kolla/ubuntu-source-senlin-engine:pike'
tempest: 'docker.io/kolla/ubuntu-source-tempest:pike'
test: 'docker.io/kolla/ubuntu-source-rally:pike'
test: 'docker.io/xrally/xrally-openstack:1.3.0'
pod:
#NOTE(portdirect): see https://github.com/openstack/kolla/blob/f62f5ae2fa5e7808722f9b37b48a50b39c20b46d/kolla/common/config.py#L695-L998
user:

2
tools/overrides/releases/pike/loci.yaml
View File

@ -79,4 +79,4 @@ images:
senlin_engine: 'docker.io/openstackhelm/senlin:pike'
senlin_engine_cleaner: 'docker.io/openstackhelm/senlin:pike'
tempest: 'docker.io/kolla/ubuntu-source-tempest:pike'
test: 'docker.io/kolla/ubuntu-source-rally:pike'
test: 'docker.io/xrally/xrally-openstack:1.3.0'