openstack
/
puppet-rally
Code Issues Proposed changes

Remove clean up logics for older releases 

These logics were added during Yoga cycle by [1]. Because the old
parameters should be removed by these clean up logic when a deployment
is upgraded to Yoga, the logics are no longer required in Zed and
later.

[1] 08640cf670

Change-Id: I6b56b05479216eb3249fa016eced0caa7b052875
This commit is contained in:
Takashi Kajinami 2022-04-14 18:19:44 +09:00
parent 2048e60e70
commit 374608c387
14 changed files with 0 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/settings/cinder.pp
View File

@ -42,12 +42,4 @@ class rally::settings::cinder (
'openstack/cinder_volume_delete_poll_interval': value => $volume_delete_poll_interval;
'openstack/cinder_volume_delete_timeout': value => $volume_delete_timeout;
}
rally_config {
'benchmark/cinder_volume_create_poll_interval': ensure => absent;
'benchmark/cinder_volume_create_prepoll_delay': ensure => absent;
'benchmark/cinder_volume_create_timeout': ensure => absent;
'benchmark/cinder_volume_delete_poll_interval': ensure => absent;
'benchmark/cinder_volume_delete_timeout': ensure => absent;
}
}

6
manifests/settings/ec2.pp
View File

@ -29,10 +29,4 @@ class rally::settings::ec2 (
'openstack/ec2_server_boot_prepoll_delay': value => $server_boot_prepoll_delay;
'openstack/ec2_server_boot_timeout': value => $server_boot_timeout;
}
rally_config {
'benchmark/ec2_server_boot_poll_interval': ensure => absent;
'benchmark/ec2_server_boot_prepoll_delay': ensure => absent;
'benchmark/ec2_server_boot_timeout': ensure => absent;
}
}

8
manifests/settings/glance.pp
View File

@ -42,12 +42,4 @@ class rally::settings::glance (
'openstack/glance_image_delete_poll_interval': value => $image_delete_poll_interval;
'openstack/glance_image_delete_timeout': value => $image_delete_timeout;
}
rally_config {
'benchmark/glance_image_create_poll_interval': ensure => absent;
'benchmark/glance_image_create_prepoll_delay': ensure => absent;
'benchmark/glance_image_create_timeout': ensure => absent;
'benchmark/glance_image_delete_poll_interval': ensure => absent;
'benchmark/glance_image_delete_timeout': ensure => absent;
}
}

25
manifests/settings/heat.pp
View File

@ -142,29 +142,4 @@ class rally::settings::heat (
'openstack/heat_stack_update_prepoll_delay': value => $stack_update_prepoll_delay;
'openstack/heat_stack_update_timeout': value => $stack_update_timeout;
}
rally_config {
'benchmark/heat_stack_check_poll_interval': ensure => absent;
'benchmark/heat_stack_check_timeout': ensure => absent;
'benchmark/heat_stack_create_poll_interval': ensure => absent;
'benchmark/heat_stack_create_prepoll_delay': ensure => absent;
'benchmark/heat_stack_create_timeout': ensure => absent;
'benchmark/heat_stack_delete_poll_interval': ensure => absent;
'benchmark/heat_stack_delete_timeout': ensure => absent;
'benchmark/heat_stack_restore_poll_interval': ensure => absent;
'benchmark/heat_stack_restore_timeout': ensure => absent;
'benchmark/heat_stack_resume_poll_interval': ensure => absent;
'benchmark/heat_stack_resume_timeout': ensure => absent;
'benchmark/heat_stack_scale_poll_interval': ensure => absent;
'benchmark/heat_stack_scale_timeout': ensure => absent;
'benchmark/heat_stack_snapshot_poll_interval': ensure => absent;
'benchmark/heat_stack_snapshot_timeout': ensure => absent;
'benchmark/heat_stack_suspend_poll_interval': ensure => absent;
'benchmark/heat_stack_suspend_timeout': ensure => absent;
'benchmark/heat_stack_update_poll_interval': ensure => absent;
'benchmark/heat_stack_update_prepoll_delay': ensure => absent;
'benchmark/heat_stack_update_timeout': ensure => absent;
'role/heat_stack_owner_role': ensure => absent;
'role/heat_stack_user_role': ensure => absent;
}
}

4
manifests/settings/ironic.pp
View File

@ -17,8 +17,4 @@ class rally::settings::ironic (
rally_config {
'openstack/ironic_node_create_poll_interval': value => $node_create_poll_interval;
}
rally_config {
'benchmark/ironic_node_create_poll_interval': ensure => absent;
}
}

6
manifests/settings/magnum.pp
View File

@ -29,10 +29,4 @@ class rally::settings::magnum (
'openstack/magnum_cluster_create_timeout': value => $magnum_cluster_create_timeout;
'openstack/magnum_cluster_create_poll_interval': value => $magnum_cluster_create_poll_interval;
}
rally_config {
'benchmark/magnum_cluster_create_prepoll_delay': ensure => absent;
'benchmark/magnum_cluster_create_timeout': ensure => absent;
'benchmark/magnum_cluster_create_poll_interval': ensure => absent;
}
}

8
manifests/settings/manila.pp
View File

@ -41,12 +41,4 @@ class rally::settings::manila (
'openstack/manila_share_delete_poll_interval': value => $share_delete_poll_interval;
'openstack/manila_share_delete_timeout': value => $share_delete_timeout;
}
rally_config {
'benchmark/manila_share_create_poll_interval': ensure => absent;
'benchmark/manila_share_create_prepoll_delay': ensure => absent;
'benchmark/manila_share_create_timeout': ensure => absent;
'benchmark/manila_share_delete_poll_interval': ensure => absent;
'benchmark/manila_share_delete_timeout': ensure => absent;
}
}

4
manifests/settings/mistral.pp
View File

@ -17,8 +17,4 @@ class rally::settings::mistral (
rally_config {
'openstack/mistral_execution_timeout': value => $mistral_execution_timeout;
}
rally_config {
'benchmark/mistral_execution_timeout': ensure => absent;
}
}

4
manifests/settings/monasca.pp
View File

@ -17,8 +17,4 @@ class rally::settings::monasca (
rally_config {
'openstack/monasca_metric_create_prepoll_delay': value => $monasca_metric_create_prepoll_delay;
}
rally_config {
'benchmark/monasca_metric_create_prepoll_delay': ensure => absent;
}
}

5
manifests/settings/murano.pp
View File

@ -23,9 +23,4 @@ class rally::settings::murano (
'openstack/murano_deploy_environment_check_interval': value => $deploy_environment_check_interval;
'openstack/murano_deploy_environment_timeout': value => $deploy_environment_timeout;
}
rally_config {
'benchmark/murano_deploy_environment_check_interval': ensure => absent;
'benchmark/murano_deploy_environment_timeout': ensure => absent;
}
}

70
manifests/settings/nova.pp
View File

@ -413,74 +413,4 @@ class rally::settings::nova (
'openstack/vm_ping_poll_interval': value => $vm_ping_poll_interval;
'openstack/vm_ping_timeout': value => $vm_ping_timeout;
}
rally_config {
'benchmark/nova_detach_volume_poll_interval': ensure => absent;
'benchmark/nova_detach_volume_timeout': ensure => absent;
'benchmark/nova_server_boot_poll_interval': ensure => absent;
'benchmark/nova_server_boot_prepoll_delay': ensure => absent;
'benchmark/nova_server_boot_timeout': ensure => absent;
'benchmark/nova_server_delete_poll_interval': ensure => absent;
'benchmark/nova_server_delete_prepoll_delay': ensure => absent;
'benchmark/nova_server_delete_timeout': ensure => absent;
'benchmark/nova_server_image_create_poll_interval': ensure => absent;
'benchmark/nova_server_image_create_prepoll_delay': ensure => absent;
'benchmark/nova_server_image_create_timeout': ensure => absent;
'benchmark/nova_server_image_delete_poll_interval': ensure => absent;
'benchmark/nova_server_image_delete_prepoll_delay': ensure => absent;
'benchmark/nova_server_image_delete_timeout': ensure => absent;
'benchmark/nova_server_live_migrate_poll_interval': ensure => absent;
'benchmark/nova_server_live_migrate_prepoll_delay': ensure => absent;
'benchmark/nova_server_live_migrate_timeout': ensure => absent;
'benchmark/nova_server_migrate_poll_interval': ensure => absent;
'benchmark/nova_server_migrate_prepoll_delay': ensure => absent;
'benchmark/nova_server_migrate_timeout': ensure => absent;
'benchmark/nova_server_pause_poll_interval': ensure => absent;
'benchmark/nova_server_pause_prepoll_delay': ensure => absent;
'benchmark/nova_server_pause_timeout': ensure => absent;
'benchmark/nova_server_reboot_poll_interval': ensure => absent;
'benchmark/nova_server_reboot_prepoll_delay': ensure => absent;
'benchmark/nova_server_reboot_timeout': ensure => absent;
'benchmark/nova_server_rebuild_poll_interval': ensure => absent;
'benchmark/nova_server_rebuild_prepoll_delay': ensure => absent;
'benchmark/nova_server_rebuild_timeout': ensure => absent;
'benchmark/nova_server_rescue_poll_interval': ensure => absent;
'benchmark/nova_server_rescue_prepoll_delay': ensure => absent;
'benchmark/nova_server_rescue_timeout': ensure => absent;
'benchmark/nova_server_resize_confirm_poll_interval': ensure => absent;
'benchmark/nova_server_resize_confirm_prepoll_delay': ensure => absent;
'benchmark/nova_server_resize_confirm_timeout': ensure => absent;
'benchmark/nova_server_resize_poll_interval': ensure => absent;
'benchmark/nova_server_resize_prepoll_delay': ensure => absent;
'benchmark/nova_server_resize_revert_poll_interval': ensure => absent;
'benchmark/nova_server_resize_revert_prepoll_delay': ensure => absent;
'benchmark/nova_server_resize_revert_timeout': ensure => absent;
'benchmark/nova_server_resize_timeout': ensure => absent;
'benchmark/nova_server_resume_poll_interval': ensure => absent;
'benchmark/nova_server_resume_prepoll_delay': ensure => absent;
'benchmark/nova_server_resume_timeout': ensure => absent;
'benchmark/nova_server_shelve_poll_interval': ensure => absent;
'benchmark/nova_server_shelve_prepoll_delay': ensure => absent;
'benchmark/nova_server_shelve_timeout': ensure => absent;
'benchmark/nova_server_start_poll_interval': ensure => absent;
'benchmark/nova_server_start_prepoll_delay': ensure => absent;
'benchmark/nova_server_start_timeout': ensure => absent;
'benchmark/nova_server_stop_poll_interval': ensure => absent;
'benchmark/nova_server_stop_prepoll_delay': ensure => absent;
'benchmark/nova_server_stop_timeout': ensure => absent;
'benchmark/nova_server_suspend_poll_interval': ensure => absent;
'benchmark/nova_server_suspend_prepoll_delay': ensure => absent;
'benchmark/nova_server_suspend_timeout': ensure => absent;
'benchmark/nova_server_unpause_poll_interval': ensure => absent;
'benchmark/nova_server_unpause_prepoll_delay': ensure => absent;
'benchmark/nova_server_unpause_timeout': ensure => absent;
'benchmark/nova_server_unrescue_poll_interval': ensure => absent;
'benchmark/nova_server_unrescue_prepoll_delay': ensure => absent;
'benchmark/nova_server_unrescue_timeout': ensure => absent;
'benchmark/nova_server_unshelve_poll_interval': ensure => absent;
'benchmark/nova_server_unshelve_prepoll_delay': ensure => absent;
'benchmark/nova_server_unshelve_timeout': ensure => absent;
'benchmark/vm_ping_poll_interval': ensure => absent;
'benchmark/vm_ping_timeout': ensure => absent;
}
}

9
manifests/settings/sahara.pp
View File

@ -47,13 +47,4 @@ class rally::settings::sahara (
'openstack/sahara_job_execution_timeout': value => $job_execution_timeout;
'openstack/sahara_workers_per_proxy': value => $workers_per_proxy;
}
rally_config {
'benchmark/sahara_cluster_check_interval': ensure => absent;
'benchmark/sahara_cluster_create_timeout': ensure => absent;
'benchmark/sahara_cluster_delete_timeout': ensure => absent;
'benchmark/sahara_job_check_interval': ensure => absent;
'benchmark/sahara_job_execution_timeout': ensure => absent;
'benchmark/sahara_workers_per_proxy': ensure => absent;
}
}

14
manifests/settings/tempest.pp
View File

@ -78,18 +78,4 @@ class rally::settings::tempest (
'openstack/flavor_ref_alt_ram': value => $flavor_ref_alt_ram;
'openstack/heat_instance_type_ram': value => $heat_instance_type_ram;
}
rally_config {
'tempest/img_url': ensure => absent;
'tempest/img_disk_format': ensure => absent;
'tempest/img_container_format': ensure => absent;
'tempest/img_name_regex': ensure => absent;
'tempest/swift_operator_role': ensure => absent;
'tempest/swift_reseller_admin_role': ensure => absent;
'tempest/heat_stack_owner_role': ensure => absent;
'tempest/heat_stack_user_role': ensure => absent;
'tempest/flavor_ref_ram': ensure => absent;
'tempest/flavor_ref_alt_ram': ensure => absent;
'tempest/heat_instance_type_ram': ensure => absent;
}
}

5
manifests/settings/watcher.pp
View File

@ -23,9 +23,4 @@ class rally::settings::watcher (
'openstack/watcher_audit_launch_poll_interval': value => $audit_launch_poll_interval;
'openstack/watcher_audit_launch_timeout': value => $audit_launch_timeout;
}
rally_config {
'benchmark/watcher_audit_launch_poll_interval': ensure => absent;
'benchmark/watcher_audit_launch_timeout': ensure => absent;
}
}