diff --git a/etc/rally.bash_completion b/etc/rally.bash_completion index cabee714..49a649ac 100644 --- a/etc/rally.bash_completion +++ b/etc/rally.bash_completion @@ -36,9 +36,6 @@ _rally() OPTS["task_status"]="--uuid" OPTS["task_use"]="--task" OPTS["task_validate"]="--deployment --task --task-args --task-args-file" - OPTS["use_deployment"]="--deployment" - OPTS["use_task"]="--uuid" - OPTS["use_verification"]="--uuid" OPTS["verify_compare"]="--uuid-1 --uuid-2 --csv --html --json --output-file --threshold" OPTS["verify_detailed"]="--uuid --sort-by" OPTS["verify_list"]="" diff --git a/rally/plugins/openstack/scenarios/cinder/volumes.py b/rally/plugins/openstack/scenarios/cinder/volumes.py index a7015892..b7102c17 100644 --- a/rally/plugins/openstack/scenarios/cinder/volumes.py +++ b/rally/plugins/openstack/scenarios/cinder/volumes.py @@ -301,17 +301,6 @@ class CinderVolumes(utils.CinderScenario, :param kwargs: Optional parameters used during volume snapshot creation. """ - if "min_size" in kwargs or "max_size" in kwargs: - import warnings - warnings.warn("'min_size' and 'max_size' arguments " - "are deprecated. You should use 'size', with " - "keys 'min' and 'max' instead.") - if "volume_size" in kwargs: - import warnings - warnings.warn("'volume_size' argument is deprecated. You should " - "use 'size' instead.") - size = kwargs["volume_size"] - if size is None: size = {"min": 1, "max": 5} selected_type = None @@ -362,12 +351,6 @@ class CinderVolumes(utils.CinderScenario, :param kwargs: Optional parameters used during volume snapshot creation. """ - if "volume_size" in kwargs: - import warnings - warnings.warn("'volume_size' argument is deprecated. You should " - "use 'size' instead.") - size = kwargs["volume_size"] - if size is None: size = {"min": 1, "max": 5} if nested_level is None: