From 273c0e9d95780619de35a79d91ce9bd11ebb124c Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Wed, 16 Jun 2021 15:04:54 +0300 Subject: [PATCH] Rename black/white list variables Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-haproxy_server/+/796629 Change-Id: I079da1803369ba24276788954663b2a7a09f6001 --- inventory/group_vars/haproxy/haproxy.yml | 23 ++++++++----------- inventory/group_vars/utility_all.yml | 6 ++--- osa_toolkit/ip.py | 2 +- .../templates/user_variables_barbican.yml.j2 | 2 +- .../templates/user_variables_ceph.yml.j2 | 2 +- .../templates/user_variables_horizon.yml.j2 | 2 +- .../templates/user_variables_ironic.yml.j2 | 4 ++-- .../templates/user_variables_magnum.yml.j2 | 4 ++-- .../templates/user_variables_manila.yml.j2 | 2 +- .../templates/user_variables_murano.yml.j2 | 2 +- .../user_variables_neutron_ovn.yml.j2 | 2 +- .../user_variables_neutron_ovs.yml.j2 | 2 +- .../templates/user_variables_octavia.yml.j2 | 2 +- .../templates/user_variables_zun.yml.j2 | 4 ++-- zuul.d/playbooks/pre-gate-cleanup.yml | 12 +++------- 15 files changed, 31 insertions(+), 40 deletions(-) diff --git a/inventory/group_vars/haproxy/haproxy.yml b/inventory/group_vars/haproxy/haproxy.yml index 6454fa8f5f..99d453690d 100644 --- a/inventory/group_vars/haproxy/haproxy.yml +++ b/inventory/group_vars/haproxy/haproxy.yml @@ -22,18 +22,15 @@ keepalived_selinux_compile_rules: # Ensure that the package state matches the global setting haproxy_package_state: "{{ package_state }}" -haproxy_whitelist_networks: +haproxy_allowlist_networks: - 192.168.0.0/16 - 172.16.0.0/12 - 10.0.0.0/8 -haproxy_galera_whitelist_networks: "{{ haproxy_whitelist_networks }}" -haproxy_keystone_admin_whitelist_networks: "{{ haproxy_whitelist_networks }}" -haproxy_nova_metadata_whitelist_networks: "{{ haproxy_whitelist_networks }}" -haproxy_rabbitmq_management_whitelist_networks: "{{ haproxy_whitelist_networks }}" -haproxy_repo_git_whitelist_networks: "{{ haproxy_whitelist_networks }}" -haproxy_repo_cache_whitelist_networks: "{{ haproxy_whitelist_networks }}" -haproxy_opendaylight_whitelist_networks: "{{ haproxy_whitelist_networks }}" +haproxy_galera_allowlist_networks: "{{ haproxy_allowlist_networks }}" +haproxy_nova_metadata_allowlist_networks: "{{ haproxy_allowlist_networks }}" +haproxy_rabbitmq_management_allowlist_networks: "{{ haproxy_allowlist_networks }}" +haproxy_opendaylight_allowlist_networks: "{{ haproxy_allowlist_networks }}" haproxy_security_txt_acl: keystone-security-txt-acl: @@ -136,7 +133,7 @@ haproxy_galera_service: haproxy_timeout_server: 5000s haproxy_backend_options: - "httpchk HEAD / HTTP/1.0\\r\\nUser-agent:\\ osa-haproxy-healthcheck" - haproxy_whitelist_networks: "{{ haproxy_galera_whitelist_networks }}" + haproxy_allowlist_networks: "{{ haproxy_galera_allowlist_networks }}" haproxy_service_enabled: "{{ groups['galera_all'] is defined and groups['galera_all'] | length > 0 }}" haproxy_glance_api_service: @@ -323,7 +320,7 @@ haproxy_nova_api_metadata_service: haproxy_balance_type: http haproxy_backend_options: - "httpchk HEAD / HTTP/1.0\\r\\nUser-agent:\\ osa-haproxy-healthcheck" - haproxy_whitelist_networks: "{{ haproxy_nova_metadata_whitelist_networks }}" + haproxy_allowlist_networks: "{{ haproxy_nova_metadata_allowlist_networks }}" haproxy_service_enabled: "{{ groups['nova_api_metadata'] is defined and groups['nova_api_metadata'] | length > 0 }}" haproxy_nova_api_compute_service: @@ -375,7 +372,7 @@ haproxy_opendaylight_neutron_service: haproxy_balance_type: tcp haproxy_timeout_client: 5000s haproxy_timeout_server: 5000s - haproxy_whitelist_networks: "{{ haproxy_opendaylight_whitelist_networks }}" + haproxy_allowlist_networks: "{{ haproxy_opendaylight_allowlist_networks }}" haproxy_service_enabled: "{{ neutron_plugin_type == 'ml2.opendaylight' }}" haproxy_opendaylight_websocket_service: @@ -386,7 +383,7 @@ haproxy_opendaylight_websocket_service: haproxy_balance_type: tcp haproxy_timeout_client: 5000s haproxy_timeout_server: 5000s - haproxy_whitelist_networks: "{{ haproxy_opendaylight_whitelist_networks }}" + haproxy_allowlist_networks: "{{ haproxy_opendaylight_allowlist_networks }}" haproxy_service_enabled: "{{ neutron_plugin_type == 'ml2.opendaylight' }}" haproxy_ovn_northbound_service: @@ -461,7 +458,7 @@ haproxy_rabbitmq_service: haproxy_balance_type: http haproxy_backend_options: - "httpchk HEAD / HTTP/1.0\\r\\nUser-agent:\\ osa-haproxy-healthcheck" - haproxy_whitelist_networks: "{{ haproxy_rabbitmq_management_whitelist_networks }}" + haproxy_allowlist_networks: "{{ haproxy_rabbitmq_management_allowlist_networks }}" haproxy_service_enabled: "{{ groups['rabbitmq'] is defined and groups['rabbitmq'] | length > 0 }}" haproxy_repo_service: diff --git a/inventory/group_vars/utility_all.yml b/inventory/group_vars/utility_all.yml index ac7e63cb81..e26656ba44 100644 --- a/inventory/group_vars/utility_all.yml +++ b/inventory/group_vars/utility_all.yml @@ -82,15 +82,15 @@ tempest_main_group: utility_all # NOTE(jrosser) # # The os_tempest role now defaults to running the smoke tests which breaks some of the roles -# Overriding the test whitelist here puts the behaviour back, but leaves the default in os_tempest +# Overriding the test includelist here puts the behaviour back, but leaves the default in os_tempest # being the smoke tests. # # Remove this override when the tempest smoke test passes for all OSA repos. # # Tests to execute: # This sets up a list of tests to execute based on what's deployed in the environment. -# The list gets added to the whitelist which tempest executes. -tempest_test_whitelist: +# The list gets added to the includelist which tempest executes. +tempest_test_includelist: - "{{ (ansible_facts['pkg_mgr'] == 'apt' and tempest_install_method == 'distro') | ternary('(?!.*\\.test_list_all_implied_roles)', '') ~ 'tempest.api.identity.admin.v3' }}" - "tempest.api.identity.v3" diff --git a/osa_toolkit/ip.py b/osa_toolkit/ip.py index a97a5cd57d..042fe613dd 100644 --- a/osa_toolkit/ip.py +++ b/osa_toolkit/ip.py @@ -173,7 +173,7 @@ class IPManager(IPBasePlugin): """ def __init__(self, queues=None, used_ips=None): - """Create a manager with various queues and a used IP blacklist + """Create a manager with various queues and a used IP excludelist :param queues: ``dict`` A dictionary containing queue names for keys and CIDR specifications for values. diff --git a/tests/roles/bootstrap-host/templates/user_variables_barbican.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables_barbican.yml.j2 index 8f14738edf..1dd84d350e 100644 --- a/tests/roles/bootstrap-host/templates/user_variables_barbican.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables_barbican.yml.j2 @@ -15,7 +15,7 @@ tempest_plugins: repo: https://opendev.org/openstack/barbican-tempest-plugin branch: master -tempest_test_whitelist: +tempest_test_includelist: - barbican_tempest_plugin.tests.api tempest_roles: diff --git a/tests/roles/bootstrap-host/templates/user_variables_ceph.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables_ceph.yml.j2 index edc7eb4913..a9c64ab3c9 100644 --- a/tests/roles/bootstrap-host/templates/user_variables_ceph.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables_ceph.yml.j2 @@ -30,5 +30,5 @@ glance_default_store: rbd glance_rbd_store_pool: images nova_libvirt_images_rbd_pool: vms # NOTE(noonedeadpunk): ceph bug to track the issue https://tracker.ceph.com/issues/46295 -tempest_test_blacklist: +tempest_test_excludelist: - tempest.scenario.test_object_storage_basic_ops.TestObjectStorageBasicOps.test_swift_acl_anonymous_download diff --git a/tests/roles/bootstrap-host/templates/user_variables_horizon.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables_horizon.yml.j2 index b5ebf8c4dc..6c5b8ded9e 100644 --- a/tests/roles/bootstrap-host/templates/user_variables_horizon.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables_horizon.yml.j2 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -tempest_test_whitelist: +tempest_test_includelist: - tempest.scenario.test_dashboard_basic_ops.TestDashboardBasicOps tempest_tempest_conf_overrides: diff --git a/tests/roles/bootstrap-host/templates/user_variables_ironic.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables_ironic.yml.j2 index d55b1f696b..f7157581f0 100644 --- a/tests/roles/bootstrap-host/templates/user_variables_ironic.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables_ironic.yml.j2 @@ -10,13 +10,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -tempest_test_whitelist: +tempest_test_includelist: - 'ironic_tempest_plugin.tests.api.admin.test_api_discovery.TestApiDiscovery' - 'ironic_tempest_plugin.tests.api.admin.test_conductor.TestConductors' - 'ironic_tempest_plugin.tests.api.admin.test_deploy_templates' - 'ironic_tempest_plugin.tests.api.admin.test_chassis.TestChassis' -tempest_test_blacklist: +tempest_test_excludelist: - 'ironic_tempest_plugin.tests.api.admin.test_chassis.TestChassis.test_chassis_node_list' tempest_service_available_ironic: true diff --git a/tests/roles/bootstrap-host/templates/user_variables_magnum.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables_magnum.yml.j2 index 75069738a5..e2e91cdd47 100644 --- a/tests/roles/bootstrap-host/templates/user_variables_magnum.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables_magnum.yml.j2 @@ -51,14 +51,14 @@ magnum_flavors: vcpus: 1 disk: 5 -tempest_test_whitelist: +tempest_test_includelist: - magnum_tempest_plugin.tests # NOTE(noonedeadpunk): We comment these tests out because of weird magnum things happening like # http://paste.openstack.org/show/790131/ # But when "b''" around auth toke is dropped, everything is fine. -tempest_test_blacklist: +tempest_test_excludelist: - magnum_tempest_plugin.tests.api.v1.test_cluster.ClusterTest.test_create_list_sign_delete_clusters - magnum_tempest_plugin.tests.api.v1.test_cluster.ClusterTest.test_create_cluster_with_nonexisting_flavor - magnum_tempest_plugin.tests.api.v1.test_cluster.ClusterTest.test_create_cluster_with_zero_nodes diff --git a/tests/roles/bootstrap-host/templates/user_variables_manila.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables_manila.yml.j2 index 205319ce4b..8a3c2611ff 100644 --- a/tests/roles/bootstrap-host/templates/user_variables_manila.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables_manila.yml.j2 @@ -32,7 +32,7 @@ tempest_flavors: disk: 3 vcpus: 1 -tempest_test_whitelist: +tempest_test_includelist: - manila_tempest_tests.tests.scenario.test_share_basic_ops.TestShareBasicOpsNFS.test_mount_share_one_vm tempest_tempest_conf_overrides: diff --git a/tests/roles/bootstrap-host/templates/user_variables_murano.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables_murano.yml.j2 index 64542a3d43..9cc5aa71d0 100644 --- a/tests/roles/bootstrap-host/templates/user_variables_murano.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables_murano.yml.j2 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -tempest_test_whitelist: +tempest_test_includelist: - murano_tempest_tests.tests.api.application_catalog tempest_tempest_conf_overrides: diff --git a/tests/roles/bootstrap-host/templates/user_variables_neutron_ovn.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables_neutron_ovn.yml.j2 index c868f6d637..c5e1f91bb2 100644 --- a/tests/roles/bootstrap-host/templates/user_variables_neutron_ovn.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables_neutron_ovn.yml.j2 @@ -23,7 +23,7 @@ tempest_plugins: - name: neutron-tempest-plugin repo: https://opendev.org/openstack/neutron-tempest-plugin branch: master -tempest_test_whitelist: +tempest_test_includelist: - "neutron_tempest_plugin.api.test_networks*" - "tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops" tempest_private_net_provider_type: geneve diff --git a/tests/roles/bootstrap-host/templates/user_variables_neutron_ovs.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables_neutron_ovs.yml.j2 index 75be913919..ccde797cf6 100644 --- a/tests/roles/bootstrap-host/templates/user_variables_neutron_ovs.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables_neutron_ovs.yml.j2 @@ -19,7 +19,7 @@ tempest_plugins: - name: neutron-tempest-plugin repo: https://opendev.org/openstack/neutron-tempest-plugin branch: master -tempest_test_whitelist: +tempest_test_includelist: - "neutron_tempest_plugin.api.test_networks*" - "tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops" tempest_private_net_provider_type: vxlan diff --git a/tests/roles/bootstrap-host/templates/user_variables_octavia.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables_octavia.yml.j2 index 41595df60b..bfd62c3ab1 100644 --- a/tests/roles/bootstrap-host/templates/user_variables_octavia.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables_octavia.yml.j2 @@ -10,7 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -tempest_test_whitelist: +tempest_test_includelist: - octavia_tempest_plugin.tests.scenario.v2.test_load_balancer.LoadBalancerScenarioTest octavia_octavia_conf_overrides: diff --git a/tests/roles/bootstrap-host/templates/user_variables_zun.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables_zun.yml.j2 index 28afd6d614..6a4184952d 100644 --- a/tests/roles/bootstrap-host/templates/user_variables_zun.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables_zun.yml.j2 @@ -13,10 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -tempest_test_whitelist: +tempest_test_includelist: - zun_tempest_plugin.tests.tempest.api -tempest_test_blacklist: +tempest_test_excludelist: - test: zun_tempest_plugin.tests.tempest.api.test_containers.TestContainer.test_run_container_with_image_driver_glance reason: This test requires direct access to the Docker daemon API on localhost - test: zun_tempest_plugin.tests.tempest.api.test_capsules.TestCapsule.test_create_capsule_full diff --git a/zuul.d/playbooks/pre-gate-cleanup.yml b/zuul.d/playbooks/pre-gate-cleanup.yml index fd195a6354..95e2bf448a 100644 --- a/zuul.d/playbooks/pre-gate-cleanup.yml +++ b/zuul.d/playbooks/pre-gate-cleanup.yml @@ -41,15 +41,9 @@ - ansible_os_family | lower == 'redhat' - ansible_distribution_major_version is version('8', '=') - - name: Remove package blacklist for yum/dnf + - name: Remove package excludes for yum/dnf lineinfile: - dest: "{{ (ansible_pkg_mgr == 'dnf') | ternary('/etc/dnf/dnf.conf', '/etc/yum.conf') }}" + dest: '/etc/dnf/dnf.conf' regexp: "^exclude=" state: absent - when: ansible_pkg_mgr in ['dnf', 'yum'] - - - name: Remove package blacklist for zypper - file: - path: /etc/zypp/locks - state: absent - when: ansible_pkg_mgr == 'zypper' + when: ansible_pkg_mgr == 'dnf'