From 7a5ed70cf8bf7634a3e2eb91afbcb96c492f8f26 Mon Sep 17 00:00:00 2001 From: matbu Date: Mon, 12 Apr 2021 12:24:41 +0200 Subject: [PATCH] Remove legacy tripleo-validations roles calls This patch remove useless tripleo-validations calls in the tripleo-quickstart-extras playbook. Only validations and standalone is used for now in CI. The other implementations was legacy implementation that is not used anymore in CI Change-Id: I2ef1f06007c646ef4307c0cc0b6f60af414f9234 --- config/environments/rdocloud.yml | 2 -- playbooks/baremetal-full-overcloud-prep.yml | 28 ------------------- playbooks/baremetal-full-overcloud.yml | 14 ---------- playbooks/baremetal-full-undercloud.yml | 14 ---------- playbooks/multinode-multiple-overcloud.yml | 14 ---------- playbooks/multinode-overcloud-prep.yml | 28 ------------------- playbooks/multinode-overcloud.yml | 14 ---------- playbooks/multinode-undercloud.yml | 14 ---------- .../quickstart-extras-overcloud-prep.yml | 28 ------------------- playbooks/quickstart-extras-overcloud.yml | 14 ---------- playbooks/quickstart-extras-undercloud.yml | 14 ---------- .../overcloud-deploy/templates/ansible.cfg.j2 | 6 ---- 12 files changed, 190 deletions(-) diff --git a/config/environments/rdocloud.yml b/config/environments/rdocloud.yml index 971b90635..42eb39fa6 100644 --- a/config/environments/rdocloud.yml +++ b/config/environments/rdocloud.yml @@ -40,8 +40,6 @@ mtu_interface: undercloud_local_mtu: "{{ mtu }}" overcloud_neutron_global_physnet_mtu: "{{ mtu }}" -run_tripleo_validations: true - # Browbeat settings elastic_host: browbeat.test.com grafana_host: browbeat.test.com diff --git a/playbooks/baremetal-full-overcloud-prep.yml b/playbooks/baremetal-full-overcloud-prep.yml index 325130a7c..eb565d513 100644 --- a/playbooks/baremetal-full-overcloud-prep.yml +++ b/playbooks/baremetal-full-overcloud-prep.yml @@ -31,20 +31,6 @@ tags: - overcloud-prep-containers -- name: Run tripleo-validations pre-introspection tests - hosts: undercloud - gather_facts: false - tags: - - tripleo-validations - vars: - validations_group: ['pre-introspection'] - tasks: - - include_role: - name: tripleo_validations - when: - - (run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool) - - release not in ['queens', 'stein'] - - name: Prepare the overcloud images for deployment hosts: undercloud gather_facts: false @@ -69,17 +55,3 @@ - {role: overcloud-ssl} tags: - overcloud-ssl - -- name: Run tripleo-validations pre-deployment tests - hosts: undercloud - gather_facts: false - tags: - - tripleo-validations - vars: - validations_group: ['pre-deployment'] - tasks: - - include_role: - name: tripleo_validations - when: - - (run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool) - - release not in ['queens', 'stein'] diff --git a/playbooks/baremetal-full-overcloud.yml b/playbooks/baremetal-full-overcloud.yml index 7740fb2bb..d6277d64b 100644 --- a/playbooks/baremetal-full-overcloud.yml +++ b/playbooks/baremetal-full-overcloud.yml @@ -20,17 +20,3 @@ debug: var=overcloud_deploy_result failed_when: overcloud_deploy_result == "failed" delegate_to: localhost - -- name: Run tripleo-validations post-deployment tests - hosts: undercloud - gather_facts: false - tags: - - tripleo-validations - vars: - validations_group: ['post-deployment'] - tasks: - - include_role: - name: tripleo_validations - when: - - (run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool) - - release not in ['queens', 'stein'] diff --git a/playbooks/baremetal-full-undercloud.yml b/playbooks/baremetal-full-undercloud.yml index ed949f56c..275227029 100644 --- a/playbooks/baremetal-full-undercloud.yml +++ b/playbooks/baremetal-full-undercloud.yml @@ -7,20 +7,6 @@ tags: - undercloud-deploy -- name: Configure tripleo-validations - hosts: undercloud - gather_facts: false - tags: - - tripleo-validations - vars: - run_tripleo_validations_setup: true - tasks: - - include_role: - name: tripleo_validations - when: - - (run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool) - - release not in ['queens', 'stein'] - - name: Validate the undercloud hosts: undercloud roles: diff --git a/playbooks/multinode-multiple-overcloud.yml b/playbooks/multinode-multiple-overcloud.yml index 4a0747210..0a3446631 100644 --- a/playbooks/multinode-multiple-overcloud.yml +++ b/playbooks/multinode-multiple-overcloud.yml @@ -69,20 +69,6 @@ failed_when: overcloud_deploy_result == "failed" delegate_to: localhost -- name: Run tripleo-validations post-deployment tests - hosts: undercloud - gather_facts: false - tags: - - tripleo-validations - vars: - validations_group: ['post-deployment'] - tasks: - - include_role: - name: tripleo_validations - when: - - (run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool) - - release not in ['queens', 'stein'] - ###################################### # Run tempest on overcloud-two stack # ###################################### diff --git a/playbooks/multinode-overcloud-prep.yml b/playbooks/multinode-overcloud-prep.yml index f58af577c..7caaf1409 100644 --- a/playbooks/multinode-overcloud-prep.yml +++ b/playbooks/multinode-overcloud-prep.yml @@ -18,20 +18,6 @@ step_glance_upload: true, step_register: false} -- name: Run tripleo-validations pre-introspection tests - hosts: undercloud - gather_facts: false - tags: - - tripleo-validations - vars: - validations_group: ['pre-introspection'] - tasks: - - include_role: - name: tripleo_validations - when: - - (run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool) - - release not in ['queens', 'stein'] - - name: Prepare for containerized deployment hosts: undercloud gather_facts: false @@ -42,20 +28,6 @@ use_overcloud_mixed_upgrade: "{{ mixed_upgrade|default(false) }}" when: containerized_overcloud|bool -- name: Run tripleo-validations pre-deployment tests - hosts: undercloud - gather_facts: false - tags: - - tripleo-validations - vars: - validations_group: ['pre-deployment'] - tasks: - - include_role: - name: tripleo_validations - when: - - (run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool) - - release not in ['queens', 'stein'] - - name: Ensure openvswitch is started and enabled hosts: overcloud tags: diff --git a/playbooks/multinode-overcloud.yml b/playbooks/multinode-overcloud.yml index bb4c0ce08..d7f2fb558 100644 --- a/playbooks/multinode-overcloud.yml +++ b/playbooks/multinode-overcloud.yml @@ -24,17 +24,3 @@ debug: var=overcloud_deploy_result failed_when: overcloud_deploy_result == "failed" delegate_to: localhost - -- name: Run tripleo-validations post-deployment tests - hosts: undercloud - gather_facts: false - tags: - - tripleo-validations - vars: - validations_group: ['post-deployment'] - tasks: - - include_role: - name: tripleo_validations - when: - - (run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool) - - release not in ['queens', 'stein'] diff --git a/playbooks/multinode-undercloud.yml b/playbooks/multinode-undercloud.yml index e503ef13d..c2d9e7608 100644 --- a/playbooks/multinode-undercloud.yml +++ b/playbooks/multinode-undercloud.yml @@ -69,20 +69,6 @@ roles: - undercloud-deploy -- name: Run tripleo-validations standalone and CLI tests - hosts: undercloud - gather_facts: false - vars: - validation_command: "openstack tripleo validator" - tags: - - tripleo-validations - tasks: - - include_role: - name: tripleo_validations - when: - - job.enable_validation|default(false)|bool - - release not in ['queens', 'stein'] - - name: Validate the undercloud hosts: undercloud roles: diff --git a/playbooks/quickstart-extras-overcloud-prep.yml b/playbooks/quickstart-extras-overcloud-prep.yml index 103a8cbe5..9727b5f6a 100644 --- a/playbooks/quickstart-extras-overcloud-prep.yml +++ b/playbooks/quickstart-extras-overcloud-prep.yml @@ -26,20 +26,6 @@ roles: - overcloud-prep-images -- name: Run tripleo-validations pre-introspection tests - hosts: undercloud - gather_facts: false - tags: - - tripleo-validations - vars: - validations_group: ['pre-introspection'] - tasks: - - include_role: - name: tripleo_validations - when: - - (run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool) - - release not in ['queens', 'stein'] - # Prepare the overcloud flavor configuration - name: Prepare overcloud flavors hosts: undercloud @@ -59,20 +45,6 @@ roles: - overcloud-prep-network -- name: Run tripleo-validations pre-deployment tests - hosts: undercloud - gather_facts: false - tags: - - tripleo-validations - vars: - validations_group: ['pre-deployment'] - tasks: - - include_role: - name: tripleo_validations - when: - - (run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool) - - release not in ['queens', 'stein'] - - name: Prepare the SSL Configuration for the overcloud deployment hosts: undercloud gather_facts: false diff --git a/playbooks/quickstart-extras-overcloud.yml b/playbooks/quickstart-extras-overcloud.yml index 059640c88..9ac2a6b1d 100644 --- a/playbooks/quickstart-extras-overcloud.yml +++ b/playbooks/quickstart-extras-overcloud.yml @@ -19,20 +19,6 @@ roles: - tripleo-inventory -- name: Run tripleo-validations post-deployment tests - hosts: undercloud - gather_facts: false - tags: - - tripleo-validations - vars: - validations_group: ['post-deployment'] - tasks: - - include_role: - name: tripleo_validations - when: - - (run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool) - - release not in ['queens', 'stein'] - # Check the results of the deployment, note after inventory has executed - name: Check the result of the deployment hosts: undercloud diff --git a/playbooks/quickstart-extras-undercloud.yml b/playbooks/quickstart-extras-undercloud.yml index 70cd5732c..988b7897e 100644 --- a/playbooks/quickstart-extras-undercloud.yml +++ b/playbooks/quickstart-extras-undercloud.yml @@ -28,20 +28,6 @@ roles: - undercloud-deploy -- name: Configure tripleo-validations - hosts: undercloud - gather_facts: false - tags: - - tripleo-validations - vars: - run_tripleo_validations_setup: true - tasks: - - include_role: - name: tripleo_validations - when: - - (run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool) - - release not in ['queens', 'stein'] - - name: Download amphora image for octavia hosts: undercloud gather_facts: false diff --git a/roles/overcloud-deploy/templates/ansible.cfg.j2 b/roles/overcloud-deploy/templates/ansible.cfg.j2 index 39ec10417..ed88c2027 100644 --- a/roles/overcloud-deploy/templates/ansible.cfg.j2 +++ b/roles/overcloud-deploy/templates/ansible.cfg.j2 @@ -2,35 +2,30 @@ '/root/.ansible/plugins/modules', '/usr/share/ansible/tripleo-plugins/modules', '/usr/share/ansible/plugins/modules', - '/usr/share/openstack-tripleo-validations/library' ] %} {% set lookups_path = [ '/root/.ansible/plugins/lookup', '/usr/share/ansible/tripleo-plugins/lookup', '/usr/share/ansible/plugins/lookup', - '/usr/share/openstack-tripleo-validations/lookup' ] %} {% set callbacks_path = [ '/root/.ansible/plugins/callback', '/usr/share/ansible/tripleo-plugins/callback', '/usr/share/ansible/plugins/callback', - '/usr/share/openstack-tripleo-validations/callback_plugins' ] %} {% set action_plugins_path = [ '/root/.ansible/plugins/action', '/usr/share/ansible/tripleo-plugins/action', '/usr/share/ansible/plugins/action', - '/usr/share/openstack-tripleo-validations/action_plugins' ] %} {% set filter_plugins_path = [ '/root/.ansible/plugins/filter', '/usr/share/ansible/tripleo-plugins/filter', '/usr/share/ansible/plugins/filter', - '/usr/share/openstack-tripleo-validations/filter_plugins' ] %} {% set roles_path = [ @@ -38,7 +33,6 @@ '/usr/share/ansible/tripleo-roles', '/usr/share/ansible/roles', '/etc/ansible/roles', - '/usr/share/openstack-tripleo-validations/roles' ] %} {% if ansible_python.version.major == 3 %}