diff --git a/ansible/roles/kolla-ansible/tasks/config.yml b/ansible/roles/kolla-ansible/tasks/config.yml index 8f4ad0a23..276700f01 100644 --- a/ansible/roles/kolla-ansible/tasks/config.yml +++ b/ansible/roles/kolla-ansible/tasks/config.yml @@ -1,12 +1,4 @@ --- -# TODO(mgoddard): Remove this task in the Antelope release. -- name: Fail if kolla_install_type is defined - fail: - msg: > - Support for binary images was removed in the Zed release. - kolla_install_type should no longer be set. - when: kolla_install_type is defined - # NOTE: We're not looping over the two inventory files to avoid having the file # content displayed in the ansible-playbook output. diff --git a/ansible/roles/kolla-ansible/templates/overcloud-services.j2 b/ansible/roles/kolla-ansible/templates/overcloud-services.j2 index f26ab1f58..235de0164 100644 --- a/ansible/roles/kolla-ansible/templates/overcloud-services.j2 +++ b/ansible/roles/kolla-ansible/templates/overcloud-services.j2 @@ -27,10 +27,6 @@ common [opensearch:children] control -# TODO: This is used for cleanup and can be removed in the Antelope cycle. -[elasticsearch-curator:children] -opensearch - # Opensearch dashboards [opensearch-dashboards:children] opensearch diff --git a/playbooks/kayobe-seed-upgrade-base/overrides.yml.j2 b/playbooks/kayobe-seed-upgrade-base/overrides.yml.j2 index 93d6c4245..a0b7c4cce 100644 --- a/playbooks/kayobe-seed-upgrade-base/overrides.yml.j2 +++ b/playbooks/kayobe-seed-upgrade-base/overrides.yml.j2 @@ -1,10 +1,4 @@ --- -# NOTE(mgoddard): Don't reboot after disabling SELinux during CI testing, as -# Ansible is run directly on the controller. -# TODO(priteau): This is needed for the deployment of the previous release. -# Remove when previous_release is zed. -disable_selinux_do_reboot: false - # Use the OpenStack infra's Dockerhub mirror. docker_registry_mirrors: - "http://{{ zuul_site_mirror_fqdn }}:8082/"