diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 486c5f8689..c95ba50684 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -51,13 +51,6 @@ kolla_external_vip_address: "{{ kolla_internal_vip_address }}" kolla_same_external_internal_vip: "{{ kolla_external_vip_address == kolla_internal_vip_address }}" kolla_external_fqdn: "{{ kolla_internal_fqdn if kolla_same_external_internal_vip | bool else kolla_external_vip_address }}" -kolla_enable_sanity_checks: "no" - -kolla_enable_sanity_barbican: "{{ kolla_enable_sanity_checks }}" -kolla_enable_sanity_keystone: "{{ kolla_enable_sanity_checks }}" -kolla_enable_sanity_glance: "{{ kolla_enable_sanity_checks }}" -kolla_enable_sanity_cinder: "{{ kolla_enable_sanity_checks }}" - kolla_dev_repos_directory: "/opt/stack/" kolla_dev_repos_git: "https://opendev.org/openstack" kolla_dev_repos_pull: "no" diff --git a/ansible/roles/barbican/tasks/check.yml b/ansible/roles/barbican/tasks/check.yml deleted file mode 100644 index bba2f1d885..0000000000 --- a/ansible/roles/barbican/tasks/check.yml +++ /dev/null @@ -1,40 +0,0 @@ ---- -- name: Barbican sanity - storing a secret - become: true - shell: > - set -o pipefail && \ - docker exec -t barbican_api openstack \ - --os-auth-url={{ openstack_auth.auth_url }} \ - --os-password={{ openstack_auth.password }} \ - --os-username={{ openstack_auth.username }} \ - --os-system-scope={{ openstack_auth.system_scope }} - secret store -f value -p kolla | head -1 - register: barbican_store_secret - run_once: True - when: kolla_enable_sanity_barbican | bool - -- name: Barbican sanity - fetch secret - become: true - command: > - docker exec -t barbican_api openstack - --os-auth-url={{ openstack_auth.auth_url }} - --os-password={{ openstack_auth.password }} - --os-username={{ openstack_auth.username }} - --os-system-scope={{ openstack_auth.system_scope }} - secret get -f value -p {{ barbican_store_secret.stdout }} - register: barbican_get_secret - failed_when: barbican_get_secret.stdout != 'kolla' - run_once: True - when: kolla_enable_sanity_barbican | bool - -- name: Barbican sanity - cleaning up - become: true - command: > - docker exec -t barbican_api openstack - --os-auth-url={{ openstack_auth.auth_url }} - --os-password={{ openstack_auth.password }} - --os-username={{ openstack_auth.username }} - --os-system-scope={{ openstack_auth.system_scope }} - secret delete {{ barbican_store_secret.stdout }} - run_once: True - when: kolla_enable_sanity_barbican | bool diff --git a/ansible/roles/cinder/tasks/check.yml b/ansible/roles/cinder/tasks/check.yml deleted file mode 100644 index 635acac119..0000000000 --- a/ansible/roles/cinder/tasks/check.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -- name: Cinder sanity check - create volume - become: true - kolla_toolbox: - module_name: os_volume - module_args: - auth: "{{ openstack_cinder_auth }}" - state: present - size: 1 - display_name: kolla_test_volume - endpoint_type: "{{ openstack_interface }}" - cacert: "{{ openstack_cacert }}" - run_once: True - delegate_to: "{{ groups['cinder-api'][0] }}" - when: kolla_enable_sanity_cinder | bool - -- name: Cinder sanity check - cleanup volume - become: true - kolla_toolbox: - module_name: os_volume - module_args: - auth: "{{ openstack_cinder_auth }}" - state: absent - display_name: kolla_test_volume - endpoint_type: "{{ openstack_interface }}" - cacert: "{{ openstack_cacert }}" - run_once: True - delegate_to: "{{ groups['cinder-api'][0] }}" - when: kolla_enable_sanity_cinder | bool diff --git a/ansible/roles/cinder/tasks/deploy.yml b/ansible/roles/cinder/tasks/deploy.yml index f123f639c1..f5deb72f6a 100644 --- a/ansible/roles/cinder/tasks/deploy.yml +++ b/ansible/roles/cinder/tasks/deploy.yml @@ -12,5 +12,3 @@ - name: Flush handlers meta: flush_handlers - -- import_tasks: check.yml diff --git a/ansible/roles/glance/tasks/check.yml b/ansible/roles/glance/tasks/check.yml deleted file mode 100644 index 77d09d5e9a..0000000000 --- a/ansible/roles/glance/tasks/check.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- -- name: Glance sanity check - create image - become: true - kolla_toolbox: - module_name: os_image - module_args: - auth: "{{ openstack_glance_auth }}" - name: "glance_sanity_check" - filename: "/etc/hostname" - endpoint_type: "{{ openstack_interface }}" - cacert: "{{ openstack_cacert }}" - delegate_to: "{{ groups['glance-api'][0] }}" - run_once: True - register: img_create - retries: 10 - delay: 3 - until: img_create is success - when: kolla_enable_sanity_glance | bool - -- name: Glance sanity check - cleanup - become: true - kolla_toolbox: - module_name: os_image - module_args: - auth: "{{ openstack_glance_auth }}" - name: "glance_sanity_check" - state: absent - endpoint_type: "{{ openstack_interface }}" - cacert: "{{ openstack_cacert }}" - delegate_to: "{{ groups['glance-api'][0] }}" - run_once: True - when: kolla_enable_sanity_glance | bool diff --git a/ansible/roles/glance/tasks/deploy.yml b/ansible/roles/glance/tasks/deploy.yml index 3b0a139232..c97f065115 100644 --- a/ansible/roles/glance/tasks/deploy.yml +++ b/ansible/roles/glance/tasks/deploy.yml @@ -13,5 +13,3 @@ - name: Flush handlers meta: flush_handlers - -- import_tasks: check.yml diff --git a/ansible/roles/keystone/tasks/check.yml b/ansible/roles/keystone/tasks/check.yml deleted file mode 100644 index 5a62096ce9..0000000000 --- a/ansible/roles/keystone/tasks/check.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -- name: Keystone sanity checks - become: true - kolla_toolbox: - module_name: os_auth - module_args: - auth: "{{ openstack_keystone_auth }}" - endpoint_type: "{{ openstack_interface }}" - cacert: "{{ openstack_cacert }}" - run_once: True - delegate_to: "{{ groups['keystone'][0] }}" - when: kolla_enable_sanity_keystone | bool diff --git a/ansible/roles/keystone/tasks/deploy.yml b/ansible/roles/keystone/tasks/deploy.yml index a6ff99b0e9..e24a17c042 100644 --- a/ansible/roles/keystone/tasks/deploy.yml +++ b/ansible/roles/keystone/tasks/deploy.yml @@ -18,8 +18,6 @@ - import_tasks: register.yml -- import_tasks: check.yml - - include_tasks: register_identity_providers.yml when: - enable_keystone_federation | bool diff --git a/doc/source/user/operating-kolla.rst b/doc/source/user/operating-kolla.rst index 42cc68864b..b4b9b3206e 100644 --- a/doc/source/user/operating-kolla.rst +++ b/doc/source/user/operating-kolla.rst @@ -221,9 +221,6 @@ service. ``kolla-ansible -i INVENTORY upgrade`` is used to upgrades existing OpenStack Environment. -``kolla-ansible -i INVENTORY check`` is used to do post-deployment smoke -tests. - ``kolla-ansible -i INVENTORY stop`` is used to stop running containers. ``kolla-ansible -i INVENTORY deploy-containers`` is used to check and if @@ -241,10 +238,6 @@ used to set environment specific details. ``kolla-ansible -i INVENTORY gather-facts`` is used to gather Ansible facts, for example to populate a fact cache. -.. note:: - - In order to do smoke tests, requires ``kolla_enable_sanity_checks=yes``. - Using Hashicorp Vault for password storage ------------------------------------------ diff --git a/releasenotes/notes/deprecate-sanity-checks-928ef3af2dc0f187.yaml b/releasenotes/notes/deprecate-sanity-checks-928ef3af2dc0f187.yaml new file mode 100644 index 0000000000..035c584925 --- /dev/null +++ b/releasenotes/notes/deprecate-sanity-checks-928ef3af2dc0f187.yaml @@ -0,0 +1,18 @@ +--- +deprecations: + - | + In the April 2022 PTG the deprecation and removal of the sanity + checks has been confirmed. Therefore the usage of + + .. code-block:: bash + + kolla-ansible check + + is not possible any more. +features: + - | + Sanity checks have been removed. These "smoke tests" orignially + were implemented for barbican, cinder, glance and keystone. +upgrade: + - | + Sanity checks have been removed because they were broken. diff --git a/tests/deploy.sh b/tests/deploy.sh index 4c00fd8781..3b5034e0a1 100755 --- a/tests/deploy.sh +++ b/tests/deploy.sh @@ -21,7 +21,6 @@ function deploy { kolla-ansible -i ${RAW_INVENTORY} -vvv pull &> /tmp/logs/ansible/pull kolla-ansible -i ${RAW_INVENTORY} -vvv deploy &> /tmp/logs/ansible/deploy kolla-ansible -i ${RAW_INVENTORY} -vvv post-deploy &> /tmp/logs/ansible/post-deploy - kolla-ansible -i ${RAW_INVENTORY} -vvv check &> /tmp/logs/ansible/check-deploy } diff --git a/tests/reconfigure.sh b/tests/reconfigure.sh index d513eb3efe..229f400014 100755 --- a/tests/reconfigure.sh +++ b/tests/reconfigure.sh @@ -14,7 +14,6 @@ function reconfigure { # trigger a real reconfigure kolla-ansible -i ${RAW_INVENTORY} -vvv prechecks &> /tmp/logs/ansible/reconfigure-prechecks kolla-ansible -i ${RAW_INVENTORY} -vvv reconfigure &> /tmp/logs/ansible/reconfigure - kolla-ansible -i ${RAW_INVENTORY} -vvv check &> /tmp/logs/ansible/check-reconfigure } diff --git a/tests/upgrade.sh b/tests/upgrade.sh index a3a608f0da..2b5d6cb37c 100755 --- a/tests/upgrade.sh +++ b/tests/upgrade.sh @@ -13,7 +13,6 @@ function upgrade { kolla-ansible -i ${RAW_INVENTORY} -vvv prechecks &> /tmp/logs/ansible/upgrade-prechecks kolla-ansible -i ${RAW_INVENTORY} -vvv pull &> /tmp/logs/ansible/pull-upgrade kolla-ansible -i ${RAW_INVENTORY} -vvv upgrade &> /tmp/logs/ansible/upgrade - kolla-ansible -i ${RAW_INVENTORY} -vvv check &> /tmp/logs/ansible/check-upgrade } diff --git a/tools/kolla-ansible b/tools/kolla-ansible index 2f80ff67a6..4a417b727d 100755 --- a/tools/kolla-ansible +++ b/tools/kolla-ansible @@ -173,7 +173,6 @@ Environment variables: Commands: install-deps Install Ansible Galaxy dependencies prechecks Do pre-deployment checks for hosts - check Do post-deployment smoke tests mariadb_recovery Recover a completely stopped mariadb cluster mariadb_backup Take a backup of MariaDB databases --full (default) @@ -224,7 +223,6 @@ cat <